Merge branch 'zdr'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 28 Nov 2012 02:22:27 +0000 (18:22 -0800)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 28 Nov 2012 02:22:27 +0000 (18:22 -0800)
commitf816bf4c7641071d83ed2c796c93ce0ddba9b3b4
treefc52005782de938c092f937753e2ad279f81d6e9
parentdedc4675baf65acb508a1b2b5069d8acf6fe2952
parentaab6538bbd55177221788df5bdb4b61698e00305
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
lib/Makefile.am
lib/socket.c