tls
Fri Dec 27 15:11:39 PST 1996
Update of /a/cvsroot/src/usr.bin/passwd
In directory netbsd1:/var/slash-tmp/cvs-serv3213

Log Message:
Import of 4.4BSD-Lite2 sources

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/passwd/passwd.1
C src/usr.bin/passwd/local_passwd.c
C src/usr.bin/passwd/passwd.c
C src/usr.bin/passwd/Makefile
C src/usr.bin/passwd/krb_passwd.c
C src/usr.bin/passwd/kpasswd_proto.h
N src/usr.bin/passwd/extern.h

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

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