Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 7 Oct 2011 16:37:18 +0000 (11:37 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 7 Oct 2011 16:37:18 +0000 (11:37 -0500)

Trivial merge