Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

It seems the format of main.mk changed in my sleep...

Conflicts:

	source/main.mk
(This used to be commit 56f2288e4f4f1aa70d11fc5f118458baf5803627)

diff --cc source4/librpc/config.mk
Simple merge

diff --cc source4/main.mk
index 83f977b9a879b4711d88de3b9421a11a1888203b,4fd1502fae3650f6366df70cb9ff0250c2e04564..3f3aea87e67969ab5717ddc43e9d90d1db4db06e
--- 1/source4/main.mk
--- 2/source4/main.mk
+++ b/source4/main.mk
@@@ -1,97 -1,49 +1,50 @@@
- mkinclude dynconfig.mk
- heimdalsrcdir := heimdal
+ mkinclude dynconfig/config.mk
  mkinclude heimdal_build/config.mk
  mkinclude config.mk
- dsdbsrcdir := dsdb
  mkinclude dsdb/config.mk
- smbdsrcdir := smbd
  mkinclude smbd/config.mk
- clustersrcdir := cluster
  mkinclude cluster/config.mk
  mkinclude smbd/process_model.mk
- libnetsrcdir := libnet
  mkinclude libnet/config.mk
- authsrcdir := auth
  mkinclude auth/config.mk
- nsswitchsrcdir := nsswitch
  mkinclude nsswitch/config.mk
- libsrcdir := lib
  mkinclude lib/samba3/config.mk
- libsocketsrcdir := lib/socket
  mkinclude lib/socket/config.mk
- libcharsetsrcdir := lib/charset
  mkinclude lib/charset/config.mk
- ldb_sambasrcdir := lib/ldb-samba
  mkinclude lib/ldb-samba/config.mk
- libtlssrcdir := lib/tls
  mkinclude lib/tls/config.mk
- libregistrysrcdir := lib/registry
  mkinclude lib/registry/config.mk
- libmessagingsrcdir := lib/messaging
  mkinclude lib/messaging/config.mk
- libeventssrcdir := lib/events
  mkinclude lib/events/config.mk
- libcmdlinesrcdir := lib/cmdline
  mkinclude lib/cmdline/config.mk
- socketwrappersrcdir := lib/socket_wrapper
  mkinclude lib/socket_wrapper/config.mk
- nsswrappersrcdir := lib/nss_wrapper
  mkinclude lib/nss_wrapper/config.mk
- appwebsrcdir := lib/appweb
  mkinclude lib/appweb/config.mk
- libstreamsrcdir := lib/stream
  mkinclude lib/stream/config.mk
- libutilsrcdir := lib/util
  mkinclude lib/util/config.mk
- libtdrsrcdir := lib/tdr
  mkinclude lib/tdr/config.mk
- libdbwrapsrcdir := lib/dbwrap
  mkinclude lib/dbwrap/config.mk
- libcryptosrcdir := lib/crypto
  mkinclude lib/crypto/config.mk
- libtorturesrcdir := lib/torture
  mkinclude lib/torture/config.mk
- libcompressionsrcdir := lib/compression
- libgencachesrcdir := lib
  mkinclude lib/basic.mk
- paramsrcdir := param
  mkinclude param/config.mk
- smb_serversrcdir := smb_server
  mkinclude smb_server/config.mk
- rpc_serversrcdir := rpc_server
  mkinclude rpc_server/config.mk
- ldap_serversrcdir := ldap_server
  mkinclude ldap_server/config.mk
- web_serversrcdir := web_server
  mkinclude web_server/config.mk
- winbindsrcdir := winbind
  mkinclude winbind/config.mk
- nbt_serversrcdir := nbt_server
  mkinclude nbt_server/config.mk
- wrepl_serversrcdir := wrepl_server
  mkinclude wrepl_server/config.mk
- cldap_serversrcdir := cldap_server
  mkinclude cldap_server/config.mk
- ntp_signd_srcdir := ntp_signd
 +mkinclude ntp_signd/config.mk
- utilssrcdir := utils
  mkinclude utils/net/config.mk
  mkinclude utils/config.mk
- ntvfssrcdir := ntvfs
  mkinclude ntvfs/config.mk
- ntptrsrcdir := ntptr
  mkinclude ntptr/config.mk
- torturesrcdir := torture
  mkinclude torture/config.mk
- librpcsrcdir := librpc
  mkinclude librpc/config.mk
- clientsrcdir := client
  mkinclude client/config.mk
- libclisrcdir := libcli
  mkinclude libcli/config.mk
- ejsscriptsrcdir := scripting/ejs
  mkinclude scripting/ejs/config.mk
- pyscriptsrcdir := scripting/python
  mkinclude scripting/python/config.mk
- kdcsrcdir := kdc
  mkinclude kdc/config.mk