Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 28 Jul 2011 15:36:28 +0000 (10:36 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 28 Jul 2011 15:36:28 +0000 (10:36 -0500)

Trivial merge