Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Mon, 1 Apr 2013 23:19:30 +0000 (18:19 -0500)
committerYanhuaSun <sun51@illinois.edu>
Mon, 1 Apr 2013 23:19:30 +0000 (18:19 -0500)

Trivial merge