Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 20 Oct 2010 16:00:52 +0000 (11:00 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 20 Oct 2010 16:00:52 +0000 (11:00 -0500)

Trivial merge