Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Wed, 11 May 2011 06:35:35 +0000 (01:35 -0500)
committerYanhuaSun <sun51@illinois.edu>
Wed, 11 May 2011 06:35:35 +0000 (01:35 -0500)

Trivial merge