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

Conflicts:
	source3/include/includes.h

diff --cc source3/Makefile.in
Simple merge

diff --cc source3/include/includes.h
index 25135d75ed50b0c4623d4a0bc2a353af1dec53b0,79495a7ecf678f8175703f6c6d28060e2e63e1a8..0417a7e01c000366b5c613ff64ff776923efa5e7
--- 1/source3/include/includes.h
--- 2/source3/include/includes.h
+++ b/source3/include/includes.h
@@@ -687,7 -687,7 +687,8 @@@ typedef char fstring[FSTRING_LEN]
  #include "msdfs.h"
  #include "rap.h"
  #include "../lib/crypto/md5.h"
 +#include "../lib/crypto/arcfour.h"
+ #include "../lib/crypto/crc32.h"
  #include "../lib/crypto/hmacmd5.h"
  #include "ntlmssp.h"
  #include "auth.h"

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

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