merge and resolve conflicts introduced by 9.4.2-P1
authorjakob <jakob@openbsd.org>
Wed, 9 Jul 2008 19:02:52 +0000 (19:02 +0000)
committerjakob <jakob@openbsd.org>
Wed, 9 Jul 2008 19:02:52 +0000 (19:02 +0000)
commite8e11a0b7e62b18b9ce1ffacbe4f2305f8bc0a28
treec58106cd78c001bf01b5c7dc012e31e4adcb3238
parentba83ed70c729a84681cfc3c4718f8f7008c07944
merge and resolve conflicts introduced by 9.4.2-P1
usr.sbin/bind/CHANGES
usr.sbin/bind/bin/named/client.c
usr.sbin/bind/bin/named/server.c
usr.sbin/bind/doc/arm/Bv9ARM-book.xml
usr.sbin/bind/doc/arm/Bv9ARM.ch06.html
usr.sbin/bind/lib/dns/api
usr.sbin/bind/lib/dns/dispatch.c
usr.sbin/bind/lib/dns/include/dns/dispatch.h
usr.sbin/bind/lib/dns/resolver.c
usr.sbin/bind/version