Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Fri, 13 Sep 2013 16:01:44 +0000 (11:01 -0500)
committerYanhua Sun <sun51@illinois.edu>
Fri, 13 Sep 2013 16:01:44 +0000 (11:01 -0500)

Trivial merge