Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 28 Jan 2012 05:01:22 +0000 (21:01 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 28 Jan 2012 05:01:22 +0000 (21:01 -0800)

Trivial merge