Merge branch 'singlesw' into single
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 14:46:22 +0000 (16:46 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 14:46:22 +0000 (16:46 +0200)
commit7fdca970407041af2f655690ddf1dc6a68d85fb7
tree481ab5a4c0aac872be76326f9f1278227dc0e291
parentbf21371c098684ccad427a54ac76766c0021bc88
parent41669237cd714c59af9e634cb2ac162d6ee57e82
Merge branch 'singlesw' into single

Conflicts:
source3/lib/socket_wrapper/socket_wrapper.c
source4/lib/replace/system/network.h
replace/system/network.h
socket_wrapper/socket_wrapper.c
source3/configure.in
source4/Makefile
source4/configure.ac
source4/torture/local/config.mk