Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

Conflicts:

	source/Makefile.in
(This used to be commit 351df194a927371600824f4c03d8a24b95fbef64)

diff --cc source3/Makefile.in
index e1f516f891050fdee4346e6f788ffe28cbe54868,b0b5c7cb1a46a031ec9af3d90a7488a1010787e1..42bea8bfbc8b4166ca7669db91c12fea2124996d
--- 1/source3/Makefile.in
--- 2/source3/Makefile.in
+++ b/source3/Makefile.in
@@@ -2005,8 -1951,8 +2005,13 @@@ clean: delheader
  # afterwards.
  proto_exists: include/proto.h include/build_env.h \
        winbindd/winbindd_proto.h web/swat_proto.h \
++<<<<<<< HEAD:source/Makefile.in
 +      libnet/libnet_proto.h \
 +      client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c
++=======
+       client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c \
+       libnet/libnet_proto.h
++>>>>>>> d6703f6d4e6a5256980188f6a840e6aaf07bc607:source/Makefile.in
        @touch proto_exists
  
  delheaders: