Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 1 Apr 2010 20:47:54 +0000 (15:47 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 1 Apr 2010 20:47:54 +0000 (15:47 -0500)

Trivial merge