CVS commit: src/dist/bind

[Geert Hendrickx <ghen%netbsd.org@localhost>]

Module Name:    src
Committed By:   ghen
Date:           Fri Mar 30 19:40:47 UTC 2007

Modified Files:
        src/dist/bind/bin/named: named.8 named.conf.5
        src/dist/bind/lib/dns: resolver.c
        src/dist/bind/lib/isc/powerpc/include/isc: atomic.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/dist/bind/bin/named/named.8 \
    src/dist/bind/bin/named/named.conf.5
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/dns/resolver.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/powerpc/include/isc/atomic.h

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