Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Mon, 8 Nov 2010 18:26:04 +0000 (12:26 -0600)
committerChao Mei <chaomei2@illinois.edu>
Mon, 8 Nov 2010 18:26:04 +0000 (12:26 -0600)

Trivial merge