CVS commit: src

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

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