Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 3 Sep 2011 02:33:09 +0000 (21:33 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 3 Sep 2011 02:33:09 +0000 (21:33 -0500)

Trivial merge