Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 8 Jan 2012 21:25:20 +0000 (15:25 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 8 Jan 2012 21:25:20 +0000 (15:25 -0600)

Trivial merge