Module Name:	src
Committed By:	rpaulo
Date:		Tue Aug  1 00:12:42 UTC 2006

Modified Files:
	src/gnu/dist/postfix/README_FILES: RELEASE_NOTES
	src/gnu/dist/postfix/conf: postfix-files
	src/gnu/dist/postfix/man/man5: postconf.5
	src/gnu/dist/postfix/src/cleanup: cleanup.h
	src/gnu/dist/postfix/src/global: mail_params.h
	src/gnu/dist/postfix/src/smtpd: smtpd.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/conf/postfix-files
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/cleanup/cleanup.h
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/src/smtpd/smtpd.c

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