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

Trivial merge