Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 15 Jan 2012 06:18:45 +0000 (00:18 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 15 Jan 2012 06:18:45 +0000 (00:18 -0600)

Trivial merge