Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@justice.(none)>
Fri, 19 Feb 2010 22:57:09 +0000 (16:57 -0600)
committerGengbin Zheng <gzheng@justice.(none)>
Fri, 19 Feb 2010 22:57:09 +0000 (16:57 -0600)

Trivial merge