Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 30 Mar 2012 21:34:38 +0000 (16:34 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 30 Mar 2012 21:34:38 +0000 (16:34 -0500)

Trivial merge