Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
authorJelmer Vernooij <jelmer@samba.org>
Tue, 22 Jan 2008 15:39:56 +0000 (16:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 22 Jan 2008 15:39:56 +0000 (16:39 +0100)
commit2f57e25f8f692889d9e057e13256f8a24c5ec10c
treeb53e13ce32f627e3d55209f26cdd223dc5e38a73
parent12cf633f7f28f5cefb0cdd90ee9f2e6b77bb3aa3
parentbd293cde1b1deadcfb0f74c82aae6ba4de39925b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
source/scripting/python/config.m4
source/selftest/target/Samba4.pm