Module Name:	src
Committed By:	rpaulo
Date:		Thu Aug 18 21:46:19 UTC 2005

Modified Files:
	src/gnu/dist/postfix: makedefs

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/makedefs

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