CVS commit: src

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

Module Name:    src
Committed By:   mellon
Date:           Mon Mar 29 23:08:23 UTC 1999

Modified Files:
        src/usr.sbin/dhcp/client: dhclient-script.8 dhclient.c
        src/usr.sbin/dhcp/client/scripts: bsdos freebsd
        src/usr.sbin/dhcp/includes: dhcpd.h
        src/usr.sbin/dhcp/server: dhcp.c dhcpd.c
Log Message:
Resolve conflicts in pl20 merge.