Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Thu, 5 May 2011 04:03:32 +0000 (23:03 -0500)
committerYanhuaSun <sun51@illinois.edu>
Thu, 5 May 2011 04:03:32 +0000 (23:03 -0500)

Trivial merge