Merge branch 'master' of git://linux-nfs.org/nfs-utils
authorGreg Banks <gnb@melbourne.sgi.com>
Mon, 3 Jul 2006 04:21:48 +0000 (14:21 +1000)
committerGreg Banks <gnb@melbourne.sgi.com>
Mon, 3 Jul 2006 04:21:48 +0000 (14:21 +1000)
1  2 
configure.in
support/nfs/conn.c
tools/rpcgen/rpc_parse.c
tools/rpcgen/rpc_scan.c
utils/idmapd/idmapd.c

diff --cc configure.in
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge