Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 5 Apr 2012 22:41:59 +0000 (17:41 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 5 Apr 2012 22:41:59 +0000 (17:41 -0500)

Trivial merge