Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 4 Jun 2010 04:05:54 +0000 (23:05 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 4 Jun 2010 04:05:54 +0000 (23:05 -0500)

Trivial merge