Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 12 Feb 2008 23:14:04 +0000 (10:14 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 12 Feb 2008 23:14:04 +0000 (10:14 +1100)
commit7714a91f6762bb8d6578d89a49bfd5672aca054c
tree60b4d72b94ecb96f95e4d8e7041bf8abe58e8fa8
parente94d710b0b959d8e69eb02ef0704ebcff56485fb
parent3cfac63d165f072464e93a12f7ad48450c66477b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 11102681bcd70b0abb2df38bcdc7fdec51e71600)