From: Russ Allbery <rra@debian.org>
Date: Wed, 1 Apr 2009 01:24:28 +0000 (-0700)
Subject: Merge commit 'upstream/1.4.9.pre2+dfsg1'
X-Git-Tag: debian/1.4.10+dfsg1-1~36
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ac988a5817a1cff7fd5105a049feec9b87643abe;p=packages%2Fo%2Fopenafs.git

Merge commit 'upstream/1.4.9.pre2+dfsg1'

Conflicts:
	src/afs/LINUX/osi_groups.c
	src/afs/LINUX/osi_vfsops.c
	src/afs/LINUX/osi_vnodeops.c
	src/audit/audit.c
	src/auth/userok.c
	src/ptserver/ptprocs.c
	src/rx/rx.c
	src/ubik/recovery.c
	src/ubik/remote.c
	src/util/get_krbrlm.c
	src/viced/host.c
	src/viced/viced.c
---

ac988a5817a1cff7fd5105a049feec9b87643abe