CVS commit: src/dist/bind

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

Module Name:    src
Committed By:   christos
Date:           Tue May  1 22:15:12 UTC 2007

Modified Files:
        src/dist/bind: README
        src/dist/bind/bin/named: query.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -r1.15 -r1.16 src/dist/bind/README
cvs rdiff -r1.4 -r1.5 src/dist/bind/bin/named/query.c

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