Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 18 Feb 2011 05:53:24 +0000 (23:53 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 18 Feb 2011 05:53:24 +0000 (23:53 -0600)

Trivial merge