Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

Conflicts:
	source4/main.mk

diff --cc pidl/pidl
Simple merge

diff --cc source4/Makefile
Simple merge

diff --cc source4/configure.ac
Simple merge

diff --cc source4/main.mk
index ea410bd0556b3027d7a7f73f90dedc5a0ceeb524,ddeb4baf2ecc2e64d4272afba68e705b027b327d..0edfa1c14418ee54ebfb3a56ffeab4bcc09b2685
--- 1/source4/main.mk
--- 2/source4/main.mk
+++ b/source4/main.mk
@@@ -16,8 -16,9 +16,8 @@@ mkinclude lib/registry/config.m
  mkinclude lib/messaging/config.mk
  mkinclude lib/events/config.mk
  mkinclude lib/cmdline/config.mk
- mkinclude lib/socket_wrapper/config.mk
- mkinclude lib/nss_wrapper/config.mk
+ mkinclude ../lib/socket_wrapper/config.mk
+ mkinclude ../lib/nss_wrapper/config.mk
 -mkinclude lib/appweb/config.mk
  mkinclude lib/stream/config.mk
  mkinclude lib/util/config.mk
  mkinclude lib/tdr/config.mk

diff --cc source4/selftest/samba4_tests.sh
Simple merge