Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 18 Mar 2012 21:51:07 +0000 (14:51 -0700)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 18 Mar 2012 21:51:07 +0000 (14:51 -0700)

Trivial merge