Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@honest1.ncsa.uiuc.edu>
Fri, 18 Mar 2011 21:29:11 +0000 (16:29 -0500)
committerGengbin Zheng <gzheng@honest1.ncsa.uiuc.edu>
Fri, 18 Mar 2011 21:29:11 +0000 (16:29 -0500)

Trivial merge