Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 9 Jan 2012 22:31:23 +0000 (14:31 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 9 Jan 2012 22:31:23 +0000 (14:31 -0800)

Trivial merge