Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Mon, 28 Mar 2011 07:19:01 +0000 (02:19 -0500)
committerChao Mei <chaomei2@illinois.edu>
Mon, 28 Mar 2011 07:19:01 +0000 (02:19 -0500)

Trivial merge