Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 9 Mar 2011 14:56:21 +0000 (08:56 -0600)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Wed, 9 Mar 2011 14:56:21 +0000 (08:56 -0600)
commit529e155460637aca424d66a119825fa858e689ac
tree28532866c0d76c2571dde3ba009dc7fb1171849e
parent22b9801f1631ef8da20403321d6da08a212c4af8
parent66561db1c90dad813987372fb392be53e676d1e5
Merge branch 'charm' of charmgit:charm into charm