Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 7 Mar 2012 23:28:35 +0000 (17:28 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 7 Mar 2012 23:28:35 +0000 (17:28 -0600)

Trivial merge