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)
commit2da0734f439ee5f4e3eb1c9416e7df4450f08534
tree3f6b8a76fa6a7748f5a8ee64514afb9874670b36
parentbb473a8d11ce0ab8d5c9f0b339861b552fc2b262
parent646c597b79cb01474ed8139e4e790206bd84632c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Conflicts:

source/torture/libnet/libnet_BecomeDC.c
source/torture/config.mk