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

Trivial merge