Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 22 Feb 2011 21:52:45 +0000 (15:52 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 22 Feb 2011 21:52:45 +0000 (15:52 -0600)

Trivial merge