OpenAFS CVS Commit: openafs/src/afs by kenh

[cvs@GRAND.CENTRAL.ORG]

Update of /cvs/openafs/src/afs
In directory GRAND.CENTRAL.ORG:/tmp/cvs-serv25420/src/afs

Modified Files:
      Tag: rxtcp
	afs_callback.c afs_daemons.c afs_mariner.c afs_prototypes.h 
	afs_util.c 
Log Message:
DELTA rxtcp-branch-merge-20060505
AUTHOR kenh@cmf.nrl.navy.mil

Merge in changes from the HEAD back down into the rxtcp branch.


--- DELTA config for rxtcp follows ---
rxtcp-branch-merge-20060505 openafs/src/afs/afs_callback.c 1.37.2.1 1.37.2.2
rxtcp-branch-merge-20060505 openafs/src/afs/afs_daemons.c 1.39.2.1 1.39.2.2
rxtcp-branch-merge-20060505 openafs/src/afs/afs_mariner.c 1.8 1.8.12.1
rxtcp-branch-merge-20060505 openafs/src/afs/afs_prototypes.h 1.71.2.1 1.71.2.2
rxtcp-branch-merge-20060505 openafs/src/afs/afs_util.c 1.22.2.1 1.22.2.2