Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 00:00:15 +0000 (01:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 00:00:15 +0000 (01:00 +0100)
commit9faf49b7f13c237aaf204ef962231ea2d58ecda0
tree35c18d275795fa480b079ad97d4cfc6340e75589
parent73138c1198c34404fae98273cea0d7fc12757b01
parentf6b2a57c9517202c554fa5a60bbe7ffd49b431f5
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 227de596865ee910bfc1e0730316e26a0a9caf51)