Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 13 Jan 2012 07:32:17 +0000 (23:32 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 13 Jan 2012 07:32:17 +0000 (23:32 -0800)

Trivial merge