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)
commit4911af47f8cd750f9b0f1374b447f171318de964
treea28fdd6e18a560b10fa52e40cec9b9f2709b46fe
parentd648c5849fba34b5691dcf1867ecd8f80fe35a6d
parent250478d0445cf56e8b0b4e876977a9ae968ff55b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 16dbbf75c7fa0f877659654a20bcab73b707e627)