Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 15:35:16 +0000 (17:35 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 15:35:16 +0000 (17:35 +0200)
commit16dbbf75c7fa0f877659654a20bcab73b707e627
treebfc26fea7087d172430637791ef0b204a18ae38f
parent4c098e4c9f071592e134c979388891f5bf16452d
parent91e9062265a68e3a1fe5e092503ec44ae5ea034e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test