Index: stable/9/tools/regression/lib/libc/nss/mach
===================================================================
--- stable/9/tools/regression/lib/libc/nss/mach	(revision 291764)
+++ stable/9/tools/regression/lib/libc/nss/mach	(revision 291765)
@@ -1,94 +1,93 @@
 # $FreeBSD$
 localhost
 above.warped.net
 anoncvs.cirr.com
 anoncvs.isc.netbsd.org
 anoncvs.leo.org
 anoncvs.netbsd.lt
 anoncvs.netbsd.ro
 anoncvs.netbsd.se
 antioche.antioche.eu.org
 boulder.tele.dk
 centaurus.4web.cz
 chur.math.ntnu.no
-cnftp.bjpu.edu.cn
 console.netbsd.org
 cvs.fi.netbsd.org
 cvs.mikrolahti.fi
 cvs.netbsd.org
 cvsup-netbsd.leo.org
 cvsup.netbsd.se
 cvsup.pasta.cs.uit.no
 ftp.bitcon.no
 ftp.chg.ru
 ftp.duth.gr
 ftp.estpak.ee
 ftp.fsn.hu
 ftp.funet.fi
 ftp.grondar.za
 ftp.leo.org
 ftp.netbsd.lt
 ftp.netbsd.org
 ftp.nluug.nl
 ftp.plig.org
 ftp.uni-erlangen.de
 ftp.xgate.co.kr
 gd.tuwien.ac.at
 gort.ludd.luth.se
 grappa.unix-ag.uni-kl.de
 info.wins.uva.nl
 irc.warped.net
 knug.youn.co.kr
 lala.iri.co.jp
 mail.jp.netbsd.org
 mail.kr.netbsd.org
 mail.netbsd.org
 melanoma.cs.rmit.edu.au
 mirror.aarnet.edu.au
 mirror.netbsd.com.br
 mirror03.inet.tele.dk
 moon.vub.ac.be
 nbwww.sergei.cc
 net.bsd.cz
 netbsd.3miasto.net
 netbsd.4ka.mipt.ru
 netbsd.apk.od.ua
 netbsd.csie.nctu.edu.tw
 netbsd.enderunix.org
 netbsd.ftp.fu-berlin.de
 netbsd.netlead.com.au
 netbsd.nsysu.edu.tw
 netbsd.pair.com
 netbsd.stevens-tech.edu
 netbsd.triada.bg
 netbsd.unix.net.nz
 netbsd.unixtech.be
 netbsd.vejas.lt
 netbsd.wagener-consulting.lu
 netbsd.zarco.org
 netbsdiso.interoute.net.uk
 netbsdwww.bitcon.no
 netbsdwww.cordef.com.pl
 netbsdwww.cs.rmit.edu.au
 netbsdwww.interoute.net.uk
 news.gw.com
 ns.netbsd.org
 pigu.iri.co.jp
 pluto.cdpa.nsysu.edu.tw
 projects.slowass.net
 server6.pasta.cs.uit.no
 skeleton.phys.spbu.ru
 snoopy.allbsd.org
 spike.allbsd.org
 sundry.netbsd.org
 tanya.sergei.cc
 web-a.fi.gw.com
 web-a.us.gw.com
 web.netbsd.mirror.arhea.net
 www.en.netbsd.de
 www.netbsd.cl
 www.netbsd.nl
 www.netbsd.org
 www.netbsd.ro
 zathras.netbsd.org
 zeppo.rediris.es
Index: stable/9/tools/regression/lib/libc/resolv/mach
===================================================================
--- stable/9/tools/regression/lib/libc/resolv/mach	(revision 291764)
+++ stable/9/tools/regression/lib/libc/resolv/mach	(revision 291765)
@@ -1,92 +1,93 @@
+# $FreeBSD$
+localhost
 above.warped.net
 anoncvs.cirr.com
 anoncvs.isc.netbsd.org
 anoncvs.leo.org
 anoncvs.netbsd.lt
 anoncvs.netbsd.ro
 anoncvs.netbsd.se
 antioche.antioche.eu.org
 boulder.tele.dk
 centaurus.4web.cz
 chur.math.ntnu.no
-cnftp.bjpu.edu.cn
 console.netbsd.org
 cvs.fi.netbsd.org
 cvs.mikrolahti.fi
 cvs.netbsd.org
 cvsup-netbsd.leo.org
 cvsup.netbsd.se
 cvsup.pasta.cs.uit.no
 ftp.bitcon.no
 ftp.chg.ru
 ftp.duth.gr
 ftp.estpak.ee
 ftp.fsn.hu
 ftp.funet.fi
 ftp.grondar.za
 ftp.leo.org
 ftp.netbsd.lt
 ftp.netbsd.org
 ftp.nluug.nl
 ftp.plig.org
 ftp.uni-erlangen.de
 ftp.xgate.co.kr
 gd.tuwien.ac.at
 gort.ludd.luth.se
 grappa.unix-ag.uni-kl.de
 info.wins.uva.nl
 irc.warped.net
 knug.youn.co.kr
 lala.iri.co.jp
 mail.jp.netbsd.org
 mail.kr.netbsd.org
 mail.netbsd.org
 melanoma.cs.rmit.edu.au
 mirror.aarnet.edu.au
 mirror.netbsd.com.br
 mirror03.inet.tele.dk
 moon.vub.ac.be
 nbwww.sergei.cc
 net.bsd.cz
 netbsd.3miasto.net
 netbsd.4ka.mipt.ru
 netbsd.apk.od.ua
 netbsd.csie.nctu.edu.tw
 netbsd.enderunix.org
 netbsd.ftp.fu-berlin.de
 netbsd.netlead.com.au
 netbsd.nsysu.edu.tw
 netbsd.pair.com
 netbsd.stevens-tech.edu
 netbsd.triada.bg
 netbsd.unix.net.nz
 netbsd.unixtech.be
 netbsd.vejas.lt
 netbsd.wagener-consulting.lu
 netbsd.zarco.org
 netbsdiso.interoute.net.uk
 netbsdwww.bitcon.no
 netbsdwww.cordef.com.pl
 netbsdwww.cs.rmit.edu.au
 netbsdwww.interoute.net.uk
 news.gw.com
 ns.netbsd.org
 pigu.iri.co.jp
 pluto.cdpa.nsysu.edu.tw
 projects.slowass.net
 server6.pasta.cs.uit.no
 skeleton.phys.spbu.ru
 snoopy.allbsd.org
 spike.allbsd.org
 sundry.netbsd.org
 tanya.sergei.cc
 web-a.fi.gw.com
 web-a.us.gw.com
 web.netbsd.mirror.arhea.net
 www.en.netbsd.de
 www.netbsd.cl
 www.netbsd.nl
 www.netbsd.org
 www.netbsd.ro
 zathras.netbsd.org
 zeppo.rediris.es
Index: stable/9/tools/regression/lib/libc
===================================================================
--- stable/9/tools/regression/lib/libc	(revision 291764)
+++ stable/9/tools/regression/lib/libc	(revision 291765)

Property changes on: stable/9/tools/regression/lib/libc
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /stable/10/tools/regression/lib/libc:r291758
Index: stable/9/tools/regression
===================================================================
--- stable/9/tools/regression	(revision 291764)
+++ stable/9/tools/regression	(revision 291765)

Property changes on: stable/9/tools/regression
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /stable/10/tools/regression:r291758
Index: stable/9/tools
===================================================================
--- stable/9/tools	(revision 291764)
+++ stable/9/tools	(revision 291765)

Property changes on: stable/9/tools
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /stable/10/tools:r291758
Index: stable/9
===================================================================
--- stable/9	(revision 291764)
+++ stable/9	(revision 291765)

Property changes on: stable/9
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
   Merged /head:r291358
   Merged /stable/10:r291758