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

Trivial merge