Merge branch 'charm' of charmgit:charm into charm
authorYanhua YanhuaSunLaptop <yanhuasun@yanhua-suns-macbook-pro.local>
Sun, 4 Apr 2010 05:40:10 +0000 (00:40 -0500)
committerYanhua YanhuaSunLaptop <yanhuasun@yanhua-suns-macbook-pro.local>
Sun, 4 Apr 2010 05:40:10 +0000 (00:40 -0500)

Trivial merge