Module Name:	src
Committed By:	perry
Date:		Tue Dec 24 20:44:18 UTC 2002

Modified Files:
	src/gnu/dist/postfix/src/smtp: smtp_addr.c smtp_connect.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/smtp/smtp_addr.c
cvs rdiff -r1.6 -r1.7 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.