Module Name:	src
Committed By:	ghen
Date:		Fri Mar 30 19:57:19 UTC 2007

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

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.57 -r1.58 src/include/netdb.h
cvs rdiff -r1.4 -r1.5 src/include/res_update.h
cvs rdiff -r1.32 -r1.33 src/include/resolv.h
cvs rdiff -r1.22 -r1.23 src/include/arpa/inet.h
cvs rdiff -r1.21 -r1.22 src/include/arpa/nameser.h
cvs rdiff -r1.2 -r1.3 src/include/arpa/nameser_compat.h

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