Module Name:	src
Committed By:	rpaulo
Date:		Sun Aug 27 00:47:09 UTC 2006

Modified Files:
	src/gnu/dist/postfix: makedefs
	src/gnu/dist/postfix/README_FILES: RELEASE_NOTES
	src/gnu/dist/postfix/conf: post-install
	src/gnu/dist/postfix/man/man5: postconf.5
	src/gnu/dist/postfix/src/smtpd: smtpd.c
	src/gnu/dist/postfix/src/util: sys_defs.h

Log Message:
fix conflicts


To generate a diff of this commit:
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/makedefs
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.16 -r1.17 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.19 -r1.20 src/gnu/dist/postfix/src/util/sys_defs.h

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