Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 25 Oct 2012 22:11:42 +0000 (17:11 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 25 Oct 2012 22:11:42 +0000 (17:11 -0500)

Trivial merge