Module Name:	src
Committed By:	christos
Date:		Sun Nov  7 01:48:01 UTC 2004

Modified Files:
	src/include: netdb.h resolv.h
	src/include/arpa: inet.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.45 -r1.46 src/include/netdb.h
cvs rdiff -r1.28 -r1.29 src/include/resolv.h
cvs rdiff -r1.19 -r1.20 src/include/arpa/inet.h

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