Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Mon, 30 Jan 2012 19:03:32 +0000 (13:03 -0600)
committerChao Mei <chaomei2@illinois.edu>
Mon, 30 Jan 2012 19:03:32 +0000 (13:03 -0600)

Trivial merge