Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Tue, 22 Apr 2008 08:21:22 +0000 (10:21 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 22 Apr 2008 08:21:22 +0000 (10:21 +0200)
commit38a4f9df170fba0a05755e06dd4362d471b3db80
treea1f3623e06ce4fd1e010afd5e72062dbee0d9b83
parent54efc107e58ed1eed7109ea08fdf808e3a15327b
parent7dddab3f6cdb36a537ca3ed9c9f3461993d1c11c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e38de45640430be002053b8bd52b615184134ba)