Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 26 Oct 2011 21:20:23 +0000 (16:20 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 26 Oct 2011 21:20:23 +0000 (16:20 -0500)

Trivial merge