Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 10:31:40 +0000 (11:31 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 10:31:40 +0000 (11:31 +0100)
commit9d0d614c7af6299482ba30c7c0ad36eed5af7474
treed2c20eeb32c7b6bb18d380fa47ab39cce06405c0
parent0419da69d5a8ab606a49598692c050447e306663
parent0e03c3aa892439bb5567b0129a40b267ecb6cee5
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 2fb93e85eb5f415fbcdfb2fc0a1a58fad823138a)