Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 13 Apr 2010 15:01:39 +0000 (10:01 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 13 Apr 2010 15:01:39 +0000 (10:01 -0500)

Trivial merge