Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 18 Oct 2010 07:28:09 +0000 (02:28 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 18 Oct 2010 07:28:09 +0000 (02:28 -0500)

Trivial merge