Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 27 Oct 2011 05:03:00 +0000 (00:03 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 27 Oct 2011 05:03:00 +0000 (00:03 -0500)

Trivial merge