Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 23 Feb 2011 00:52:29 +0000 (18:52 -0600)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 23 Feb 2011 00:52:29 +0000 (18:52 -0600)

Trivial merge