tls
Thu Jan  9 07:17:32 PST 1997
Update of /a/cvsroot/src/usr.bin/printenv
In directory netbsd1:/var/slash-tmp/cvs-serv7161

Modified Files:
	Makefile printenv.1 printenv.c 
Log Message:
Sync to 4.4BSD-Lite2

tls
Thu Jan  9 07:19:21 PST 1997
Update of /a/cvsroot/src/usr.bin/ruptime
In directory netbsd1:/var/slash-tmp/cvs-serv7472

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/ruptime/ruptime.1
C src/usr.bin/ruptime/Makefile
C src/usr.bin/ruptime/ruptime.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/ruptime