Merge branch 'charm' of charmgit:charm into charm
authorYanhua Yanhua <sun51@illinois.edu>
Wed, 24 Mar 2010 01:36:36 +0000 (20:36 -0500)
committerYanhua Yanhua <sun51@illinois.edu>
Wed, 24 Mar 2010 01:36:36 +0000 (20:36 -0500)

Trivial merge