Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Fri, 15 Oct 2010 05:06:09 +0000 (00:06 -0500)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Fri, 15 Oct 2010 05:06:09 +0000 (00:06 -0500)

Trivial merge