Merge branch 'charm' of charmgit:charm into charm
authorXiang Ni <xiangni2@illinois.edu>
Wed, 28 Aug 2013 22:15:37 +0000 (17:15 -0500)
committerXiang Ni <xiangni2@illinois.edu>
Wed, 28 Aug 2013 22:15:37 +0000 (17:15 -0500)

Trivial merge