Merge branch 'charm' of charmgit:charm into charm
authorYanhua YanhuaSunLaptop <yanhuasun@yanhua-suns-macbook-pro.local>
Wed, 24 Mar 2010 05:01:16 +0000 (00:01 -0500)
committerYanhua YanhuaSunLaptop <yanhuasun@yanhua-suns-macbook-pro.local>
Wed, 24 Mar 2010 05:01:16 +0000 (00:01 -0500)

Trivial merge