CVS commit: src/dist/bind

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Thu Jul 10 21:18:38 UTC 2008

Modified Files:
        src/dist/bind/bin/named: query.c
        src/dist/bind/lib/dns: adb.c resolver.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 src/dist/bind/bin/named/query.c
cvs rdiff -r1.5 -r1.6 src/dist/bind/lib/dns/adb.c \
    src/dist/bind/lib/dns/resolver.c

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