From: Russ Allbery <rra@debian.org>
Date: Sat, 14 May 2011 17:44:50 +0000 (-0700)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.6.0.pre5-1~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f5e3a0cca3ebcb3b577a21f21e5ea95626a68ab6;p=packages%2Fo%2Fopenafs.git

Merge branch 'upstream'

Conflicts:
	acinclude.m4
	src/afs/LINUX/osi_compat.h
	src/afs/LINUX/osi_misc.c
---

f5e3a0cca3ebcb3b577a21f21e5ea95626a68ab6