Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 28 Oct 2011 22:05:28 +0000 (17:05 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 28 Oct 2011 22:05:28 +0000 (17:05 -0500)

Trivial merge