From: Russ Allbery <rra@debian.org>
Date: Tue, 4 May 2010 23:18:38 +0000 (-0700)
Subject: Merge commit 'upstream/1.5.74.1' into experimental
X-Git-Tag: debian/1.5.74.1-1~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e811e32dc1408a4b07f220b9785b9431ceff78ca;p=packages%2Fo%2Fopenafs.git

Merge commit 'upstream/1.5.74.1' into experimental

Conflicts:
	src/kauth/admin_tools.c
---

e811e32dc1408a4b07f220b9785b9431ceff78ca