Merge branch 'upstream'

Conflicts:
	config.guess
	config.sub
	configure
	debian/changelog
	debian/control
	debian/etc.exports
	debian/nfs-common.default
	debian/nfs-common.dirs
	debian/nfs-common.init
	debian/nfs-common.install
	debian/nfs-common.postinst
	debian/nfs-common.postrm
	debian/nfs-common.prerm
	debian/nfs-kernel-server.default
	debian/nfs-kernel-server.dirs
	debian/nfs-kernel-server.init
	debian/nfs-kernel-server.postinst
	debian/nfs-kernel-server.postrm
	debian/nfs-kernel-server.prerm
	debian/rules
	utils/gssd/Makefile
	utils/svcgssd/Makefile

diff --cc support/export/export.c
Simple merge

diff --cc support/nfs/exports.c
Simple merge

diff --cc utils/exportfs/exportfs.c
Simple merge

diff --cc utils/exportfs/exports.man
Simple merge

diff --cc utils/mountd/mountd.c
Simple merge

diff --cc utils/nhfsstone/nhfsrun
Simple merge