Module Name:	src
Committed By:	heas
Date:		Thu Aug  2 08:26:20 UTC 2007

Modified Files:
	src/gnu/dist/postfix/README_FILES: RELEASE_NOTES
	src/gnu/dist/postfix/man/man5: postconf.5
	src/gnu/dist/postfix/src/cleanup: cleanup_envelope.c
	src/gnu/dist/postfix/src/global: mail_params.h
	src/gnu/dist/postfix/src/smtp: smtp_connect.c
	src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_peer.c
	src/gnu/dist/postfix/src/util: Makefile.in

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/cleanup/cleanup_envelope.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.19 -r1.20 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.19 -r1.20 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/src/smtpd/smtpd_peer.c
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/src/util/Makefile.in

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