Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 27 Mar 2010 00:24:48 +0000 (19:24 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 27 Mar 2010 00:24:48 +0000 (19:24 -0500)

Trivial merge