Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 30 Dec 2011 01:15:10 +0000 (17:15 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 30 Dec 2011 01:15:10 +0000 (17:15 -0800)

Trivial merge