Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@honest2.ncsa.uiuc.edu>
Thu, 4 Feb 2010 02:00:40 +0000 (20:00 -0600)
committerGengbin Zheng <gzheng@honest2.ncsa.uiuc.edu>
Thu, 4 Feb 2010 02:00:40 +0000 (20:00 -0600)

Trivial merge