Module Name:	basesrc
Committed By:	itojun
Date:		Fri Aug 27 16:06:18 UTC 1999

Modified Files:
	basesrc/lib/libwrap: fix_options.c hosts_access.c socket.c

Log Message:
resolve conflicts on upgrade (to 7.6).


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 basesrc/lib/libwrap/fix_options.c
cvs rdiff -r1.8 -r1.9 basesrc/lib/libwrap/hosts_access.c
cvs rdiff -r1.5 -r1.6 basesrc/lib/libwrap/socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.