Merge branch 'charm' of charmgit:charm into charm
authorYanhua Yanhua <sun51@illinois.edu>
Fri, 30 Jul 2010 22:57:21 +0000 (17:57 -0500)
committerYanhua Yanhua <sun51@illinois.edu>
Fri, 30 Jul 2010 22:57:21 +0000 (17:57 -0500)

Trivial merge