Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@justice.(none)>
Wed, 17 Feb 2010 18:08:51 +0000 (12:08 -0600)
committerGengbin Zheng <gzheng@justice.(none)>
Wed, 17 Feb 2010 18:08:51 +0000 (12:08 -0600)

Trivial merge