<<<<<<< /lib/face/.machinelist
(.*\.)?research\.bell-labs\.com	astro
(.*\.)?cs\.bell-labs\.com	astro
(.*\.)?plan9\.bell-labs\.com	astro
(.*\.)?x\.bell-labs\.com	astro
(.*\.)?delos\.com bsdi.com
(.*\.)?(bostic|sleepycat)\.com	bostic
alice	astro
arjuna	astro
fry	astro
gauss	astro
plan9	astro
research	astro
rice	astro
slepian	astro
troy-ind astro
mouse	impact
.*\.su.oz.au		acsnet
.*\.usyd.edu.au	acsnet
.*\.utoronto.ca	toronto.edu
prologic.com	prologic
cert\.org	sei.cmu.edu
||||||| .machinelist.orig
plan9\.bell-labs\.com	astro
lucent\.com	astro
.*bell-labs\.com	astro
.*\.oz.au		acsnet
=======
plan9\.bell-labs\.com	astro
lucent\.com	astro
.*bell-labs\.com	astro
.*\.oz.au		acsnet
.*\.cbc\.ca	cbc.ca
>>>>>>> .machinelist