Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 13 May 2010 21:29:08 +0000 (16:29 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 13 May 2010 21:29:08 +0000 (16:29 -0500)

Trivial merge