Module Name:	src
Committed By:	heas
Date:		Sat May 19 17:49:51 UTC 2007

Modified Files:
	src/gnu/dist/postfix: makedefs
	src/gnu/dist/postfix/README_FILES: INSTALL RELEASE_NOTES
	src/gnu/dist/postfix/conf: master.cf post-install postfix-files
	    postfix-script
	src/gnu/dist/postfix/man/man5: canonical.5 postconf.5 virtual.5
	src/gnu/dist/postfix/man/man8: cleanup.8 local.8
	src/gnu/dist/postfix/src/cleanup: cleanup.c cleanup.h
	    cleanup_envelope.c cleanup_init.c
	src/gnu/dist/postfix/src/dns: dns_lookup.c
	src/gnu/dist/postfix/src/global: Makefile.in mail_params.h
	src/gnu/dist/postfix/src/qmgr: qmgr_message.c
	src/gnu/dist/postfix/src/smtp: smtp_connect.c
	src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_peer.c
	src/gnu/dist/postfix/src/util: Makefile.in inet_listen.c match_list.c
	    sys_defs.h
Removed Files:
	src/gnu/dist/postfix/README_FILES: LMTP_README
	src/gnu/dist/postfix/examples/smtpd-policy: postfix-policyd-spf.pl
	src/gnu/dist/postfix/html: CYRUS_README.html LMTP_README.html
	    QMQP_README.html ULTRIX_README.html
	src/gnu/dist/postfix/proto: CYRUS_README.html LMTP_README.html
	    MACOSX_README QMQP_README.html ULTRIX_README.html
	src/gnu/dist/postfix/src/smtp: legacy.c levels.c

Log Message:
Resolve import conflicts


To generate a diff of this commit:
cvs rdiff -r1.16 -r1.17 src/gnu/dist/postfix/makedefs
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/README_FILES/INSTALL
cvs rdiff -r1.1.1.4 -r0 src/gnu/dist/postfix/README_FILES/LMTP_README
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/conf/master.cf
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/conf/postfix-files
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/conf/postfix-script
cvs rdiff -r1.1.1.1 -r0 \
    src/gnu/dist/postfix/examples/smtpd-policy/postfix-policyd-spf.pl
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/html/CYRUS_README.html \
    src/gnu/dist/postfix/html/LMTP_README.html \
    src/gnu/dist/postfix/html/QMQP_README.html \
    src/gnu/dist/postfix/html/ULTRIX_README.html
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/man/man5/canonical.5
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/man/man5/virtual.5
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/man/man8/cleanup.8
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/man/man8/local.8
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/proto/CYRUS_README.html \
    src/gnu/dist/postfix/proto/LMTP_README.html \
    src/gnu/dist/postfix/proto/MACOSX_README \
    src/gnu/dist/postfix/proto/QMQP_README.html \
    src/gnu/dist/postfix/proto/ULTRIX_README.html
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/cleanup/cleanup.c \
    src/gnu/dist/postfix/src/cleanup/cleanup_envelope.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/cleanup/cleanup.h
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/cleanup/cleanup_init.c
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/dns/dns_lookup.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/global/Makefile.in
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.16 -r1.17 src/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/src/smtp/legacy.c \
    src/gnu/dist/postfix/src/smtp/levels.c
cvs rdiff -r1.18 -r1.19 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.18 -r1.19 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/src/smtpd/smtpd_peer.c
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/util/Makefile.in
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/util/inet_listen.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/util/match_list.c
cvs rdiff -r1.21 -r1.22 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.