Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 17 Oct 2012 16:17:41 +0000 (11:17 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 17 Oct 2012 16:17:41 +0000 (11:17 -0500)

Trivial merge