Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 14 Feb 2008 02:37:37 +0000 (13:37 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 14 Feb 2008 02:37:37 +0000 (13:37 +1100)
commit501e8fbc3dd49e4e1b9ccc08f830af4f8c1a1095
treece7e7914cf366f3abd52b07d5244a558de5eb28b
parent039f85835d60ae48c4176891598cf24e18d0cd0a
parent411776505cea3932a196e8439a8198b4e419d901
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 309cf408e01c36e2a12ed2d1462f2bbe407d4597)