Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Thu, 24 Feb 2011 08:36:10 +0000 (02:36 -0600)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Thu, 24 Feb 2011 08:36:10 +0000 (02:36 -0600)
commit35b45185f503ea1be85556a644db83bf564cbd22
treef784e8988bd6bd283a1917a53be5df70f966db11
parent55e9a450d8ecea106a6e8a33b60fd84b48d7718f
parent3be1a5462d4e515ae5773cdc61327dd5afe137c1
Merge branch 'charm' of charmgit:charm into charm