CVS commit: src/external/ibm-public/postfix/dist

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    src
Committed By:   tron
Date:           Wed Nov  9 19:06:34 UTC 2011

Modified Files:
        src/external/ibm-public/postfix/dist: makedefs
        src/external/ibm-public/postfix/dist/src/util: sys_defs.h

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/util/sys_defs.h

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