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

Merge branch 'upstream'

Conflicts:
	configure
	utils/mountd/fsloc.c
---

18dbe6d642c9d26312a494470d213dd9609d019d