Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 8 Apr 2010 21:06:30 +0000 (16:06 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 8 Apr 2010 21:06:30 +0000 (16:06 -0500)

Trivial merge