Merge branch 'master' into win32-3

author Ronnie Sahlberg <ronniesahlberg@gmail.com>

Sat, 3 Sep 2011 01:11:36 +0000 (11:11 +1000)

committer Ronnie Sahlberg <ronniesahlberg@gmail.com>

Sat, 3 Sep 2011 01:11:36 +0000 (11:11 +1000)
author Ronnie Sahlberg <ronniesahlberg@gmail.com>
Sat, 3 Sep 2011 01:11:36 +0000 (11:11 +1000)
committer Ronnie Sahlberg <ronniesahlberg@gmail.com>
Sat, 3 Sep 2011 01:11:36 +0000 (11:11 +1000)
diff --cc lib/init.c
Simple merge
diff --cc lib/libnfs.c
Simple merge
diff --cc lib/pdu.c
Simple merge
diff --cc nfs/nfs.c
Simple merge
author	Ronnie Sahlberg <ronniesahlberg@gmail.com>
	Sat, 3 Sep 2011 01:11:36 +0000 (11:11 +1000)
committer	Ronnie Sahlberg <ronniesahlberg@gmail.com>
	Sat, 3 Sep 2011 01:11:36 +0000 (11:11 +1000)
		1	2
lib/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/libnfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pdu.c	patch \|	diff1 \|	diff2 \|	blob \| history
nfs/nfs.c	patch \|	diff1 \|	diff2 \|	blob \| history