OpenAFS CVS Commit: openafs/src/afs by rra

[cvs@GRAND.CENTRAL.ORG]

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

Modified Files:
	afs_pioctl.c 
Log Message:
DELTA disconnected-merge-conflict-20080630
AUTHOR rra@stanford.edu
LICENSE BSD

Fix a disconnected-mode merge conflict with an older import of disconnected
to HEAD that caused a duplicate definition of PDiscon.  I believe this
problem was only on HEAD.


--- DELTA config follows ---
disconnected-merge-conflict-20080630 openafs/src/afs/afs_pioctl.c 1.127 1.128