Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 2 Dec 2011 21:49:59 +0000 (15:49 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 2 Dec 2011 21:49:59 +0000 (15:49 -0600)

Trivial merge