Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 7 Nov 2010 18:08:40 +0000 (12:08 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 7 Nov 2010 18:08:40 +0000 (12:08 -0600)

Trivial merge