Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 4 Dec 2011 16:30:27 +0000 (10:30 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 4 Dec 2011 16:30:27 +0000 (10:30 -0600)

Trivial merge