Merge branch 'singlesw' into single

Conflicts:
	source3/lib/socket_wrapper/socket_wrapper.c
	source4/lib/replace/system/network.h

diff --cc replace/system/network.h
Simple merge

diff --cc socket_wrapper/socket_wrapper.c
Simple merge

diff --cc source3/configure.in
Simple merge

diff --cc source4/Makefile
Simple merge

diff --cc source4/configure.ac
Simple merge

diff --cc source4/torture/local/config.mk
Simple merge