Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@honest1.ncsa.uiuc.edu>
Fri, 11 Dec 2009 22:20:30 +0000 (16:20 -0600)
committerGengbin Zheng <gzheng@honest1.ncsa.uiuc.edu>
Fri, 11 Dec 2009 22:20:30 +0000 (16:20 -0600)

Trivial merge