Module Name:	src
Committed By:	rpaulo
Date:		Thu Aug 18 21:55:59 UTC 2005

Modified Files:
	src/gnu/dist/postfix/man/man8: cleanup.8 lmtp.8 local.8

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/man/man8/cleanup.8 \
    src/gnu/dist/postfix/man/man8/lmtp.8 \
    src/gnu/dist/postfix/man/man8/local.8

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