Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:17 +0000 (17:46 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:17 +0000 (17:46 +1000)
commit7177df5df95c9fc0d2bc36340b948697980f00d3
tree43e9115d1a87dabe743cf5092de56a8bb239e05a
parent5f873a4d8fbcd2eaeabb452ffba059338ed55dfc
parent0965b22ec561588201a3a79f1f1e316834c8ce0b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit ce7b1424c711949e6feb0181d3759133b77391ff)