Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Sat, 30 Oct 2010 22:46:13 +0000 (17:46 -0500)
committerChao Mei <chaomei2@illinois.edu>
Sat, 30 Oct 2010 22:46:13 +0000 (17:46 -0500)

Trivial merge