From: Russ Allbery <rra@debian.org>
Date: Fri, 27 Jun 2008 22:43:36 +0000 (-0700)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.4.7.dfsg1-3~35
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8cdd23cb2860d2f57dedd482e89a6a510b8831e0;p=packages%2Fo%2Fopenafs.git

Merge branch 'upstream'

Conflicts:

	openafs/config.guess
	openafs/config.sub
	openafs/configure
	openafs/configure-libafs
	openafs/src/libafs/make_kbuild_makefile.pl
---

8cdd23cb2860d2f57dedd482e89a6a510b8831e0
diff --cc configure
index 0fb0ac4cb,c0707b9e6..c0707b9e6
mode 100755,100644..100755
--- a/configure
+++ b/configure
diff --cc configure-libafs
index 16295477c,66972e31e..66972e31e
mode 100755,100644..100755
--- a/configure-libafs
+++ b/configure-libafs