Module Name:	src
Committed By:	rpaulo
Date:		Tue Nov  7 03:09:19 UTC 2006

Modified Files:
	src/gnu/dist/postfix: makedefs
	src/gnu/dist/postfix/man/man5: postconf.5
	src/gnu/dist/postfix/man/man8: local.8
	src/gnu/dist/postfix/src/cleanup: cleanup.h
	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
	src/gnu/dist/postfix/src/util: sys_defs.h

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/makedefs
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/man/man8/local.8
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/cleanup/cleanup.h
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.16 -r1.17 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.17 -r1.18 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.20 -r1.21 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.