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

Merge branch 'upstream'

Conflicts:
	configure
	support/include/config.h.in
---

cdbdd5f613dc65748717e136243adf46d0c3fe31