Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 20 Feb 2011 06:47:57 +0000 (00:47 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 20 Feb 2011 06:47:57 +0000 (00:47 -0600)

Trivial merge