Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Fri, 18 Feb 2011 22:56:01 +0000 (16:56 -0600)
committerChao Mei <chaomei2@illinois.edu>
Fri, 18 Feb 2011 22:56:01 +0000 (16:56 -0600)

Trivial merge