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

Merge branch 'upstream'

Conflicts:
	configure
	utils/mountd/Makefile.in
---

7d668dbaa15287ea5aafb79059fd407178759e78