Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Mon, 9 May 2011 04:51:53 +0000 (23:51 -0500)
committerYanhuaSun <sun51@illinois.edu>
Mon, 9 May 2011 04:51:53 +0000 (23:51 -0500)

Trivial merge