Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Fri, 22 Jun 2012 19:51:26 +0000 (14:51 -0500)
committerYanhuaSun <sun51@illinois.edu>
Fri, 22 Jun 2012 19:51:26 +0000 (14:51 -0500)

Trivial merge