Log Message: Rename 'djbdns-qmerge2' option to 'djbdns-mergequeries', still enabled by default. Deprecate 'djbdns-qmerge1'. When applying the 'djbdns-mergequeries' patch, also apply a missing bounds check. Patch from Tim Stewart on dns@list.cr.yp.to. Bump PKGREVISION.