Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 18 Feb 2012 00:02:08 +0000 (18:02 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 18 Feb 2012 00:02:08 +0000 (18:02 -0600)

Trivial merge