Merge branch 'charm' of charmgit:charm into charm v6.3.0-beta3
authorGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 2 Mar 2011 14:20:36 +0000 (08:20 -0600)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 2 Mar 2011 14:20:36 +0000 (08:20 -0600)

Trivial merge