Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 20 Jun 2011 19:34:11 +0000 (14:34 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 20 Jun 2011 19:34:11 +0000 (14:34 -0500)

Trivial merge