From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 14 Jul 2010 02:16:17 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1%1.2.2-1~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6295bb04c73403a219bc96cc6770fc96bec19ba6;p=nfs-utils.git

Merge branch 'upstream'

Conflicts:
	Makefile.in
	aclocal.m4
	aclocal/ltversion.m4
	compile
	config.guess
	config.sub
	configure
	linux-nfs/Makefile.in
	ltmain.sh
	support/Makefile.in
	support/export/Makefile.in
	support/include/Makefile.in
	support/include/config.h.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/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/mount/Makefile.in
	utils/mountd/Makefile.in
	utils/nfsd/Makefile.in
	utils/nfsstat/Makefile.in
	utils/showmount/Makefile.in
	utils/statd/Makefile.in
---

6295bb04c73403a219bc96cc6770fc96bec19ba6