Module Name:	src
Committed By:	rpaulo
Date:		Thu Dec 21 02:56:37 UTC 2006

Modified Files:
	src/gnu/dist/postfix/conf: post-install
	src/gnu/dist/postfix/src/qmgr: qmgr_message.c
	src/gnu/dist/postfix/src/smtp: smtp_connect.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.17 -r1.18 src/gnu/dist/postfix/src/smtp/smtp_connect.c

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