Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Fri, 15 Feb 2008 14:27:21 +0000 (15:27 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 15 Feb 2008 14:27:21 +0000 (15:27 +0100)
Conflicts:

source/torture/libnet/libnet_BecomeDC.c

1  2 
source/torture/config.mk

Simple merge