mrg
Fri Oct 17 01:47:22 PDT 1997
Update of /cvsroot/src/usr.sbin
In directory netbsd1:/var/slash-tmp/aa

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.sbin/Makefile.inc
C src/usr.sbin/Makefile

2 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin


mrg
Fri Oct 17 01:50:01 PDT 1997
Update of /cvsroot/src/usr.sbin/sliplogin
In directory netbsd1:/var/slash-tmp/cvs-serv10156

Modified Files:
	Makefile pathnames.h slip.hosts slip.login sliplogin.8 
	sliplogin.c 
Log Message:
merge lite-2