mrg
Sun Oct  5 08:40:55 PDT 1997
Update of /cvsroot/doc
In directory netbsd1:/var/slash-tmp/cvs-serv29553

Modified Files:
	CHANGES 
Log Message:
note lpr changes.

mrg
Sun Oct  5 08:44:45 PDT 1997
Update of /cvsroot/src/usr.sbin/inetd
In directory netbsd1:/var/slash-tmp/inetd

Log Message:
lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.sbin/inetd/pathnames.h
C src/usr.sbin/inetd/inetd.c
C src/usr.sbin/inetd/inetd.8
C src/usr.sbin/inetd/Makefile

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

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