Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 23 Apr 2010 19:02:07 +0000 (14:02 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 23 Apr 2010 19:02:07 +0000 (14:02 -0500)

Trivial merge