Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jul 2008 01:27:23 +0000 (11:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jul 2008 01:27:23 +0000 (11:27 +1000)
commit7d84b72a70f01a29f0293f6d2f3515aebb1a4dd8
treee662661db6159a077d628eb9f89ab9e0b47a8329
parentf4cae6a9131b303980cf23b971be407a1215345d
parent853ef0d5ef79b3187bd706f08d842170bc625cfd
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 55bde3c9daeafdac04574365c23d181345639f34)