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

Merge branch 'upstream'

Conflicts:
	aclocal.m4
	config.guess
	config.sub
	configure
	ltmain.sh
---

a444076202333c68108c21c0d89e251c092ff957