Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 1 Apr 2012 21:45:39 +0000 (16:45 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 1 Apr 2012 21:45:39 +0000 (16:45 -0500)

Trivial merge