Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 11 Jul 2012 03:33:56 +0000 (22:33 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 11 Jul 2012 03:33:56 +0000 (22:33 -0500)

Trivial merge