Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Fri, 4 Feb 2011 23:38:24 +0000 (17:38 -0600)
committerChao Mei <chaomei2@illinois.edu>
Fri, 4 Feb 2011 23:38:24 +0000 (17:38 -0600)

Trivial merge