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)
commit7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34
treebd2cbe93e80692486c969a80cfececbf8bb6dcdd
parentcc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31
parentbc4eacb5d89ca8dca123e2d6bd6eba47ed93b771
Merge branch 'v4-0-test' into v4-0-gmake3

Conflicts:

source/auth/config.mk
source/auth/gensec/config.mk
source/torture/smbtorture.c
(This used to be commit edfd02e59bba86b977bd60848f57a614691fff7a)
source4/auth/ntlm/auth.c
source4/build/make/rules.mk
source4/librpc/config.mk
source4/torture/smbtorture.c