Module Name:	src
Committed By:	perry
Date:		Tue Dec 24 20:47:56 UTC 2002

Modified Files:
	src/gnu/dist/postfix/src/util: Makefile.in sys_defs.h valid_hostname.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/util/Makefile.in \
    src/gnu/dist/postfix/src/util/sys_defs.h
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/src/util/valid_hostname.c

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