Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 24 Oct 2011 21:02:26 +0000 (16:02 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 24 Oct 2011 21:02:26 +0000 (16:02 -0500)

Trivial merge