Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Fri, 6 Jan 2012 23:17:53 +0000 (17:17 -0600)
committerChao Mei <chaomei2@illinois.edu>
Fri, 6 Jan 2012 23:17:53 +0000 (17:17 -0600)

Trivial merge