CVS commit: src

[Ted Lemon <mellon%netbsd.org@localhost>]

Module Name:    src
Committed By:   mellon
Date:           Fri Mar 26 17:52:46 UTC 1999

Modified Files:
        src/usr.sbin/dhcp/client: dhclient.c
        src/usr.sbin/dhcp/includes: dhcpd.h
        src/usr.sbin/dhcp/server: bootp.c dhcp.c dhcpd.c dhcpd.conf.5
Log Message:
Fix conflicts in merge.