Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Tue, 3 May 2011 19:31:06 +0000 (14:31 -0500)
committerChao Mei <chaomei2@illinois.edu>
Tue, 3 May 2011 19:31:06 +0000 (14:31 -0500)

Trivial merge