From: Russ Allbery <rra@debian.org>
Date: Mon, 8 Mar 2010 22:52:43 +0000 (-0800)
Subject: Merge commit 'upstream/1.4.12.pre4+dfsg'
X-Git-Tag: debian/1.4.12+dfsg-1~8
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0fdb65f19e6728cb577bdba3aa32e2c54d54d517;p=packages%2Fo%2Fopenafs.git

Merge commit 'upstream/1.4.12.pre4+dfsg'

Conflicts:
	configure.in
	src/afs/LINUX/osi_file.c
	src/cf/linux-test3.m4
	src/cf/linux-test4.m4
	src/viced/host.c
---

0fdb65f19e6728cb577bdba3aa32e2c54d54d517