Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge

diff --cc source3/Makefile.in
Simple merge

diff --cc source3/include/includes.h
Simple merge

diff --cc source3/include/proto.h
Simple merge

diff --cc source3/include/rpc_dce.h
Simple merge

diff --cc source3/libnet/libnet_join.c
Simple merge

diff --cc source3/libsmb/trusts_util.c
Simple merge

diff --cc source3/printing/nt_printing.c
Simple merge

diff --cc source3/rpc_client/cli_pipe.c
Simple merge

diff --cc source3/rpc_client/cli_samr.c
Simple merge

diff --cc source3/rpc_parse/parse_prs.c
Simple merge

diff --cc source3/rpc_server/srv_samr_nt.c
Simple merge

diff --cc source3/rpcclient/cmd_lsarpc.c
Simple merge

diff --cc source3/rpcclient/cmd_samr.c
Simple merge

diff --cc source3/rpcclient/rpcclient.c
Simple merge

diff --cc source3/utils/net_ads.c
Simple merge

diff --cc source3/utils/net_rpc.c
Simple merge

diff --cc source3/utils/net_rpc_join.c
Simple merge

diff --cc source3/winbindd/winbindd_ads.c
Simple merge

diff --cc source3/winbindd/winbindd_cm.c
Simple merge

diff --cc source3/winbindd/winbindd_pam.c
Simple merge