Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 28 Jan 2011 20:22:21 +0000 (14:22 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 28 Jan 2011 20:22:21 +0000 (14:22 -0600)

Trivial merge