Merge branch 'master' of git://linux-nfs.org/nfs-utils

author Greg Banks <gnb@melbourne.sgi.com>

Mon, 3 Jul 2006 04:21:48 +0000 (14:21 +1000)

committer Greg Banks <gnb@melbourne.sgi.com>

Mon, 3 Jul 2006 04:21:48 +0000 (14:21 +1000)
author Greg Banks <gnb@melbourne.sgi.com>
Mon, 3 Jul 2006 04:21:48 +0000 (14:21 +1000)
committer Greg Banks <gnb@melbourne.sgi.com>
Mon, 3 Jul 2006 04:21:48 +0000 (14:21 +1000)
diff --cc configure.in
Simple merge
diff --cc support/nfs/conn.c
Simple merge
diff --cc tools/rpcgen/rpc_parse.c
Simple merge
diff --cc tools/rpcgen/rpc_scan.c
Simple merge
diff --cc utils/idmapd/idmapd.c
Simple merge
author	Greg Banks <gnb@melbourne.sgi.com>
	Mon, 3 Jul 2006 04:21:48 +0000 (14:21 +1000)
committer	Greg Banks <gnb@melbourne.sgi.com>
	Mon, 3 Jul 2006 04:21:48 +0000 (14:21 +1000)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
support/nfs/conn.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/rpcgen/rpc_parse.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/rpcgen/rpc_scan.c	patch \|	diff1 \|	diff2 \|	blob \| history
utils/idmapd/idmapd.c	patch \|	diff1 \|	diff2 \|	blob \| history