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

diff --cc configure.in
Simple merge

diff --cc src/bozo/bosoprocs.c
Simple merge

diff --cc src/cf/osconf.m4
Simple merge

diff --cc src/shlibafsauthent/Makefile.in
Simple merge

diff --cc src/shlibafsrpc/Makefile.in
Simple merge

diff --cc src/venus/fstrace.c
Simple merge