Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 16 Mar 2010 05:38:53 +0000 (00:38 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 16 Mar 2010 05:38:53 +0000 (00:38 -0500)

Trivial merge