Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 27 Mar 2008 23:19:21 +0000 (10:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 27 Mar 2008 23:19:21 +0000 (10:19 +1100)
commit59d8d17093efac3a177a032f2e121ea6f43a96c8
tree1b2d31581bf176374db7b190bf74cb06801c358b
parent5a740f4daa79cf1b5fc9f24e424ae50e10932f4b
parentf47df5761571dd5c36789fb2e225a1125ca0e8f7
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local