Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 30 Mar 2011 14:49:10 +0000 (09:49 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 30 Mar 2011 14:49:10 +0000 (09:49 -0500)

Trivial merge