Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Thu, 27 May 2010 16:33:34 +0000 (11:33 -0500)
committerChao Mei <chaomei2@illinois.edu>
Thu, 27 May 2010 16:33:34 +0000 (11:33 -0500)

Trivial merge