Merge branch 'v4-0-test' into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2008 16:08:00 +0000 (18:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2008 16:08:00 +0000 (18:08 +0200)
commitedfd02e59bba86b977bd60848f57a614691fff7a
treeb0b194a01b3b5d79f53be6c5de6f942b5ac8fcae
parent13bbd420681519894a4036729c43273912c9b402
parenta90971ea0c43ce3b42b95aef5973139576b51959
Merge branch 'v4-0-test' into v4-0-gmake3

Conflicts:

source/auth/config.mk
source/auth/gensec/config.mk
source/torture/smbtorture.c
source/auth/ntlm/auth.c
source/build/make/rules.mk
source/librpc/config.mk
source/torture/smbtorture.c