Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Mon, 25 Feb 2008 11:58:09 +0000 (12:58 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 25 Feb 2008 11:58:09 +0000 (12:58 +0100)
commit1a646af0647f021d99473a8991c35e616a423ea6
treeb84f0cafa6f222fbf0bbaec8a5e03e00a999fff9
parent3074a9c713910f1cec8d252a36fa51aefc308c9a
parentdf576d69c6981a4879a0e9447069fcfacb3588db
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/build/smb_build/header.pm
source/build/smb_build/makefile.pm
source/lib/ldb/include/ldb_private.h
source/build/smb_build/input.pm
source/build/smb_build/makefile.pm
source/lib/ldb/common/ldb_modules.c