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

Trivial merge