Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 9 Mar 2011 14:56:21 +0000 (08:56 -0600)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 9 Mar 2011 14:56:21 +0000 (08:56 -0600)

Trivial merge