Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Wed, 16 Mar 2011 22:30:05 +0000 (17:30 -0500)
committerChao Mei <chaomei2@illinois.edu>
Wed, 16 Mar 2011 22:30:05 +0000 (17:30 -0500)

Trivial merge