Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 1 Mar 2011 03:57:53 +0000 (21:57 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 1 Mar 2011 03:57:53 +0000 (21:57 -0600)

Trivial merge