Module Name:	src
Committed By:	perry
Date:		Tue Dec 24 20:40:52 UTC 2002

Modified Files:
	src/gnu/dist/postfix/man/man5: virtual.5
	src/gnu/dist/postfix/man/man8: local.8

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/man/man5/virtual.5
cvs rdiff -r1.2 -r1.3 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.