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

Merge branch 'upstream'

Conflicts:
	autom4te.cache/output.0
	autom4te.cache/output.1
	configure
---