Merge branch 'charm' of charmgit:charm into charm
authorYanhua Yanhua <sun51@illinois.edu>
Fri, 20 Aug 2010 18:06:20 +0000 (13:06 -0500)
committerYanhua Yanhua <sun51@illinois.edu>
Fri, 20 Aug 2010 18:06:20 +0000 (13:06 -0500)

Trivial merge