Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 13 Aug 2008 00:08:23 +0000 (10:08 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 13 Aug 2008 00:08:23 +0000 (10:08 +1000)
commit5eb48615ea59610738d13d2a8780f268cb7db86c
tree7b169aab18a4f52cc0f3bc2a2a29384182845a2c
parent7177df5df95c9fc0d2bc36340b948697980f00d3
parent8c0fbbf6e927db9fdbffc28fcde0bea97c5e60e6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 0819922a0c7f48c2517d3572f98cd1359749c4ae)