Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 18 Oct 2010 22:04:16 +0000 (17:04 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 18 Oct 2010 22:04:16 +0000 (17:04 -0500)

Trivial merge