Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Mon, 25 Mar 2013 16:55:16 +0000 (11:55 -0500)
committerYanhuaSun <sun51@illinois.edu>
Mon, 25 Mar 2013 16:55:16 +0000 (11:55 -0500)

Trivial merge