Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into nosmbpython
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 10:22:05 +0000 (12:22 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 10:22:05 +0000 (12:22 +0200)
commitd17b9c4509f8430d01dea924e625ef9d2fdaad90
treedd6c822348c1c337be22fdf648fb8ca5686f8908
parent904359cd2fcacf41d3e886921f40c7cb227b255d
parent59105620dc6aff5bfd23a25841778f28825b4386
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into nosmbpython
(This used to be commit 5c56464a6c2f29a039ba3152de83d34778ca0615)