From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 14 Jul 2010 01:42:00 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1%1.0.11_git-20060105-1~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=da31666c2663759c28c4cff4b2125c5062a51cac

Merge branch 'upstream'

Conflicts:
	aclocal.m4
	config.guess
	config.sub
	configure
	utils/Makefile.in
---

da31666c2663759c28c4cff4b2125c5062a51cac