Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Fri, 16 Jul 2010 00:01:54 +0000 (19:01 -0500)
committerChao Mei <chaomei2@illinois.edu>
Fri, 16 Jul 2010 00:01:54 +0000 (19:01 -0500)

Trivial merge