Subject: CVS commit: src
To: None <source-changes@netbsd.org>
From: Ted Lemon <mellon@netbsd.org>
List: source-changes
Date: 02/18/1999 14:04:07 
Module Name:	src
Committed By:	mellon
Date:		Thu Feb 18 22:04:07 UTC 1999

Modified Files:
	src/usr.sbin/dhcp/client: dhclient.c
	src/usr.sbin/dhcp/common: dhcp-options.5
	src/usr.sbin/dhcp/includes: dhcpd.h
	src/usr.sbin/dhcp/server: bootp.c dhcp.c dhcpd.c dhcpd.conf.5
	    dhcpd.leases.5
Log Message:
Resolve conflicts in 2.0b1pl13 import