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

Merge branch 'upstream'

Conflicts:
	configure
---

f067460b9a6be8c0890f6c9bbdd5a2fbf940121b