From: Ben Hutchings Date: Wed, 14 Jul 2010 01:44:41 +0000 (+0100) Subject: Merge branch 'upstream' X-Git-Tag: debian/1%1.0.11_git-20060117-1~1 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f9cfe7c8a02ef187e411d5019ee0b6fe266e0cb1;p=nfs-utils.git Merge branch 'upstream' Conflicts: Makefile.in aclocal.m4 autom4te.cache/output.0 autom4te.cache/output.1 autom4te.cache/requests autom4te.cache/traces.0 autom4te.cache/traces.1 compile configure depcomp install-sh linux-nfs/Makefile.in missing support/Makefile.in support/export/Makefile.in support/include/Makefile.in support/include/nfs/Makefile.in support/include/rpcsvc/Makefile.in support/include/sys/Makefile.in support/include/sys/fs/Makefile.in support/misc/Makefile.in support/nfs/Makefile.in tools/Makefile.in tools/getiversion/Makefile.in tools/getkversion/Makefile.in tools/locktest/Makefile.in tools/nlmtest/Makefile.in tools/rpcdebug/Makefile.in tools/rpcgen/Makefile.in utils/Makefile.in utils/exportfs/Makefile.in utils/gssd/Makefile.in utils/idmapd/Makefile.in utils/lockd/Makefile.in utils/mount/Makefile.in utils/mountd/Makefile.in utils/nfsd/Makefile.in utils/nfsstat/Makefile.in utils/rquotad/Makefile.in utils/showmount/Makefile.in utils/statd/Makefile.in --- f9cfe7c8a02ef187e411d5019ee0b6fe266e0cb1