NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

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

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

tls
Thu Jan  9 07:28:38 PST 1997
Update of /a/cvsroot/src/usr.bin/rwho
In directory netbsd1:/var/slash-tmp/cvs-serv8539

Log Message:
Import from 4.4BSD-Lite2

Status:

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

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

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