Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Fri, 25 Feb 2011 06:25:09 +0000 (00:25 -0600)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Fri, 25 Feb 2011 06:25:09 +0000 (00:25 -0600)

Trivial merge