Merge commit 'upstream/1.4.11.pre1+dfsg1'

Conflicts:
	src/afs/Makefile.in

diff --cc configure.in
Simple merge

diff --cc src/afs/Makefile.in
index 507d18f25bf01d4a30be5faf3964ada78a783624,34800373a36ecd46ba724b94983346059b737f50..19be5c1c08c6a94d5ed5ff84473a18e248c88bda
--- 1/src/afs/Makefile.in
--- 2/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@@ -43,11 -39,7 +39,7 @@@ afszcm.cat: afs_trace.ms
                        gencat afszcm.cat afs_trace.msf ;; \
        esac
  
 -install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h ${DESTDIR}${includedir}/afs/sysctl.h
 +install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h
-       case ${SYS_NAME} in \
-               pmax_ul43 | pmax_ul43a) \
-                       ${INSTALL} longc_procs.h ${DESTDIR}${includedir}/afs ;; \
-       esac
        case ${SYS_NAME} in \
                *linux* ) \
                        ${INSTALL} ${MKAFS_OSTYPE}/osi_vfs.h ${DESTDIR}${includedir}/afs || true ;;\
@@@ -131,11 -123,7 +123,7 @@@ ${TOP_INCDIR}/afs/nfsclient.h: nfsclien
        ${INSTALL} $? $@
  
  
 -dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h ${DEST}/include/afs/sysctl.h
 +dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h
-       case ${SYS_NAME} in \
-               pmax_ul43 | pmax_ul43a) \
-                       ${INSTALL} longc_procs.h ${DEST}/include/afs ;; \
-       esac
        case ${SYS_NAME} in \
                i386_fbsd* ) \
                        echo skipping afszcm.cat install for ${SYS_NAME} ;; \

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