Subject: CVS commit: src/lib/libc/nameser
To: None <>
From: Christos Zoulas <>
List: source-changes
Date: 11/07/2004 02:19:49
Module Name:	src
Committed By:	christos
Date:		Sun Nov  7 02:19:49 UTC 2004

Modified Files:
	src/lib/libc/nameser: ns_name.c ns_print.c

Log Message:
Merge conflicts

To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/lib/libc/nameser/ns_name.c
cvs rdiff -r1.4 -r1.5 src/lib/libc/nameser/ns_print.c

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