Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 19 Apr 2012 02:00:44 +0000 (21:00 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 19 Apr 2012 02:00:44 +0000 (21:00 -0500)

Trivial merge