Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Thu, 28 Oct 2010 23:38:28 +0000 (18:38 -0500)
committerChao Mei <chaomei2@illinois.edu>
Thu, 28 Oct 2010 23:38:28 +0000 (18:38 -0500)

Trivial merge