Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Tue, 22 Oct 2013 20:32:32 +0000 (15:32 -0500)
committerYanhuaSun <sun51@illinois.edu>
Tue, 22 Oct 2013 20:32:32 +0000 (15:32 -0500)

Trivial merge