Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 5 Jun 2010 06:22:26 +0000 (01:22 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 5 Jun 2010 06:22:26 +0000 (01:22 -0500)

Trivial merge