CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Luke Mewburn <lukem%netbsd.org@localhost>]

Module Name:    src
Committed By:   lukem
Date:           Wed Aug 13 04:15:48 UTC 2008

Modified Files:
        src/external/bsd/openldap/dist/libraries/libldap: os-local.c

Log Message:
resolve conflicts between merge from 2.4.9 to 2.4.11


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 \
    src/external/bsd/openldap/dist/libraries/libldap/os-local.c

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