Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 23 Feb 2011 00:52:29 +0000 (18:52 -0600)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 23 Feb 2011 00:52:29 +0000 (18:52 -0600)
commit752fab2d02641b0b051811d2685164a2a788457d
tree951b0b1cdd90973b421fb45ad260d59143284f56
parentdd1ef5e4a90a5dd726991943e5ba941f66757c3e
parentdf8aa83a993a69ef0e6c7fa3a6909f31704dd775
Merge branch 'charm' of charmgit:charm into charm