Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 31 Mar 2010 06:13:11 +0000 (01:13 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 31 Mar 2010 06:13:11 +0000 (01:13 -0500)

Trivial merge