Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 05:52:08 +0000 (15:52 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 05:52:08 +0000 (15:52 +1000)
commit4bfab3bedbf36979424e3d284e8bd67c8224d47b
tree35531e74f8349559ab534a50f0938aa6479379f1
parent6e5f2454acb6ad11e799faed834fb4937651737d
parentf96f623854d3cd8bdaacd25979618f1cb53b8f93
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 9fa48b3572cb4e55cfaa48a8b516a91904048573)