Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Thu, 5 May 2011 17:29:51 +0000 (12:29 -0500)
committerChao Mei <chaomei2@illinois.edu>
Thu, 5 May 2011 17:29:51 +0000 (12:29 -0500)

Trivial merge