Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 8 Aug 2012 06:05:25 +0000 (01:05 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 8 Aug 2012 06:05:25 +0000 (01:05 -0500)

Trivial merge