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

Trivial merge