Merge branch 'zdr'

Manually fixyp some merge conflicts in :
	lib/init.c
	lib/pdu.c
	lib/socket.c
	nfs/Makefile.am
	nfs/nfs.x
	nlm/Makefile.am

diff --cc lib/Makefile.am
Simple merge

diff --cc lib/socket.c
index 413ebbe4c8e4009cca6f0ccbc506a5a02b657014,1ba846a1c8151893a8b2237bd8c0f06afa2faa99..83ca50e1765ad365a6f67650edcb01119a133bea
--- 1/lib/socket.c
--- 2/lib/socket.c
+++ b/lib/socket.c
@@@ -140,10 -139,10 +139,12 @@@ static int rpc_read_from_socket(struct 
        int available;
        int size;
        int pdu_size;
-       int64_t count;
+       int32_t count;
+ 
+       assert(rpc->magic == RPC_CONTEXT_MAGIC);
  
 +      assert(rpc->magic == RPC_CONTEXT_MAGIC);
 +
  #if defined(WIN32)
        if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
  #else