Module Name:	src
Committed By:	rpaulo
Date:		Thu Aug 18 21:33:04 UTC 2005

Modified Files:
	src/gnu/dist/postfix/README_FILES: INSTALL RELEASE_NOTES

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/README_FILES/INSTALL
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES

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