Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@honest4.ncsa.uiuc.edu>
Fri, 11 Dec 2009 09:17:05 +0000 (03:17 -0600)
committerGengbin Zheng <gzheng@honest4.ncsa.uiuc.edu>
Fri, 11 Dec 2009 09:17:05 +0000 (03:17 -0600)

Trivial merge