Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 7 Oct 2011 18:21:00 +0000 (11:21 -0700)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 7 Oct 2011 18:21:00 +0000 (11:21 -0700)

Trivial merge