Merge branch 'charm' of charmgit:charm into charm
authorYanhua Yanhua <sun51@illinois.edu>
Thu, 29 Jul 2010 04:45:57 +0000 (23:45 -0500)
committerYanhua Yanhua <sun51@illinois.edu>
Thu, 29 Jul 2010 04:45:57 +0000 (23:45 -0500)

Trivial merge