Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 30 Jan 2011 16:31:07 +0000 (10:31 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 30 Jan 2011 16:31:07 +0000 (10:31 -0600)

Trivial merge