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:03:52 +0000 (01:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 00:03:52 +0000 (01:03 +0100)
commit9464be3a5995d93437ca92bfd3588ffc5dfbe1a1
tree99f0bde36696a6dfb1c5e78ffc24c2e816db56b7
parent734fea474c6ff45c8b4ecb373de74ae2f702db91
parent32401d4f2d3b18ac24224310fc2c27750b873b48
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 4bce5c669630b834548612aaed18fe31ecbc1064)