Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 13 Apr 2010 16:52:14 +0000 (11:52 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 13 Apr 2010 16:52:14 +0000 (11:52 -0500)

Trivial merge