Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Fri, 9 Mar 2012 03:38:15 +0000 (21:38 -0600)
committerChao Mei <chaomei2@illinois.edu>
Fri, 9 Mar 2012 03:38:15 +0000 (21:38 -0600)

Trivial merge