Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@h2ologin1.ncsa.illinois.edu>
Mon, 6 Aug 2012 23:34:21 +0000 (18:34 -0500)
committerGengbin Zheng <gzheng@h2ologin1.ncsa.illinois.edu>
Mon, 6 Aug 2012 23:34:21 +0000 (18:34 -0500)

Trivial merge