CVS: cvs.openbsd.org: src

[Jakob Schlyter]

CVSROOT:        /cvs
Module name:    src
Changes by:     [EMAIL PROTECTED]       2008/07/09 13:02:52

Modified files:
        usr.sbin/bind  : CHANGES version 
        usr.sbin/bind/bin/named: client.c server.c 
        usr.sbin/bind/doc/arm: Bv9ARM-book.xml Bv9ARM.ch06.html 
        usr.sbin/bind/lib/dns: api dispatch.c resolver.c 
        usr.sbin/bind/lib/dns/include/dns: dispatch.h 

Log message:
merge and resolve conflicts introduced by 9.4.2-P1