Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Wed, 2 Mar 2011 07:44:14 +0000 (01:44 -0600)
committerChao Mei <chaomei2@illinois.edu>
Wed, 2 Mar 2011 07:44:14 +0000 (01:44 -0600)

Trivial merge