Module Name:	src
Committed By:	perry
Date:		Tue Dec 24 20:36:52 UTC 2002

Modified Files:
	src/gnu/dist/postfix/src/global: Makefile.in mail_params.h
	    own_inet_addr.c own_inet_addr.h resolve_local.c tok822_parse.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/global/Makefile.in \
    src/gnu/dist/postfix/src/global/resolve_local.c \
    src/gnu/dist/postfix/src/global/tok822_parse.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/src/global/mail_params.h \
    src/gnu/dist/postfix/src/global/own_inet_addr.c
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/src/global/own_inet_addr.h

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