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 20:19:46 +0000 (22:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 22 Apr 2008 20:19:46 +0000 (22:19 +0200)
commitf8dc2ca022951daa1e04360915e8d9deb2a5af5e
treeadc07a44003a164cc0c117e7b2561ca1c6d984c6
parent38a4f9df170fba0a05755e06dd4362d471b3db80
parent996d1bc09063fc42c2ac4907d5d9cdf106aec38c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 10a1a53d8beb56b7e12149c50e2685a1578413b9)