Module Name:	src
Committed By:	christos
Date:		Sat Jan 27 21:25:23 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:
Merge back all our changes.


To generate a diff of this commit:
cvs rdiff -r1.55 -r1.56 src/include/netdb.h
cvs rdiff -r1.3 -r1.4 src/include/res_update.h
cvs rdiff -r1.31 -r1.32 src/include/resolv.h
cvs rdiff -r1.21 -r1.22 src/include/arpa/inet.h
cvs rdiff -r1.19 -r1.20 src/include/arpa/nameser.h
cvs rdiff -r1.1.1.3 -r1.2 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.