Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 19 Aug 2008 04:10:53 +0000 (14:10 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 19 Aug 2008 04:10:53 +0000 (14:10 +1000)
commitaef684da3149eaf2b8d87c4903af241c9a2311a6
tree5b383bca4046f59b243293e721b730f860fb86ec
parent47d80366bef5e62b6727a574b2300cc94a2e18f7
parent4422617f7a5c36740263397b1672f75efe879520
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 27d07df301d60e49d36efd003f2fd2305c83c3fe)