Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 12 Oct 2011 03:04:50 +0000 (20:04 -0700)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 12 Oct 2011 03:04:50 +0000 (20:04 -0700)

Trivial merge