Merge branch 'charm' of charmgit:charm into charm
authorYanhua Yanhua <sun51@illinois.edu>
Sun, 20 Feb 2011 07:31:32 +0000 (01:31 -0600)
committerYanhua Yanhua <sun51@illinois.edu>
Sun, 20 Feb 2011 07:31:32 +0000 (01:31 -0600)

Trivial merge