Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Sat, 14 Sep 2013 01:16:51 +0000 (20:16 -0500)
committerYanhua Sun <sun51@illinois.edu>
Sat, 14 Sep 2013 01:16:51 +0000 (20:16 -0500)

Trivial merge