Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sat, 1 Mar 2008 11:23:08 +0000 (12:23 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 1 Mar 2008 11:23:08 +0000 (12:23 +0100)
commite580c5c904c84c3cde01f9d29e95a4983900115e
tree786ede07f50f1f3149869b3c03fe16eb91fbaf86
parent98db64734367da419877dd87d0548d93be23d483
parent0de1a63c18a83fd97938816fe869c42cbe92aac9
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit cfd1a91c6e319bc28a60bb6aae4443b1246500cb)