Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 23 Mar 2010 21:48:29 +0000 (16:48 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 23 Mar 2010 21:48:29 +0000 (16:48 -0500)

Trivial merge