Log Message: ----------- resolve conflict Modified Files: -------------- src/contrib/mDNSResponder/mDNSCore: mDNS.c (r1.3 -> r1.4) (http://cvsweb.midnightbsd.org/src/contrib/mDNSResponder/mDNSCore/mDNS.c?r1=1.3&r2=1.4)