Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 17 Oct 2010 00:48:30 +0000 (19:48 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 17 Oct 2010 00:48:30 +0000 (19:48 -0500)

Trivial merge