Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 13 Mar 2012 22:37:20 +0000 (17:37 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 13 Mar 2012 22:37:20 +0000 (17:37 -0500)

Trivial merge