Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 23:47:18 +0000 (09:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 23:47:18 +0000 (09:47 +1000)
commite85abe7db21eec47adecae8243a25f145aa7ec9a
tree9ae1696495fa30da37d8d9e9177124a5ee8f4dc3
parent7ad0d8dd4dab6119ca6f94b64b35c8f975a27d0a
parent9246924effd4d0b08ca1ef87e45ad510020df93e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet