From: Russ Allbery <rra@debian.org>
Date: Mon, 8 Apr 2013 18:16:31 +0000 (-0700)
Subject: Merge tag 'upstream/1.6.2.1'
X-Git-Tag: debian/1.6.2.1-1~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1f4e870a83bc3fbf25a7786c06fc670cdbe92238;p=packages%2Fo%2Fopenafs.git

Merge tag 'upstream/1.6.2.1'

Upstream version 1.6.2.1

Conflicts:
	configure-libafs.ac
	configure.ac
	src/config/NTMakefile.amd64_w2k
	src/config/NTMakefile.i386_nt40
	src/config/NTMakefile.i386_w2k
---

1f4e870a83bc3fbf25a7786c06fc670cdbe92238