Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Tue, 29 Mar 2011 22:06:00 +0000 (17:06 -0500)
committerChao Mei <chaomei2@illinois.edu>
Tue, 29 Mar 2011 22:06:00 +0000 (17:06 -0500)

Trivial merge