Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 27 Apr 2010 02:25:19 +0000 (21:25 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 27 Apr 2010 02:25:19 +0000 (21:25 -0500)

Trivial merge