Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 24 Feb 2012 22:41:32 +0000 (16:41 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 24 Feb 2012 22:41:32 +0000 (16:41 -0600)

Trivial merge