Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 13 Nov 2011 03:26:19 +0000 (21:26 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 13 Nov 2011 03:26:19 +0000 (21:26 -0600)

Trivial merge