Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 19 Mar 2012 18:02:20 +0000 (11:02 -0700)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 19 Mar 2012 18:02:20 +0000 (11:02 -0700)

Trivial merge