From: Russ Allbery <rra@debian.org>
Date: Tue, 20 Dec 2011 20:45:53 +0000 (-0800)
Subject: Merge commit 'upstream/1.6.1.pre1'
X-Git-Tag: debian/1.6.1.pre1-1~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=eb63658b6021f0db7a87aafcb79953c2c818905f;p=packages%2Fo%2Fopenafs.git

Merge commit 'upstream/1.6.1.pre1'

Conflicts:
	src/libuafs/Makefile.common.in
	src/viced/afsfileprocs.c
---

eb63658b6021f0db7a87aafcb79953c2c818905f