Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 26 Oct 2012 17:52:18 +0000 (12:52 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 26 Oct 2012 17:52:18 +0000 (12:52 -0500)

Trivial merge