CVS commit: src

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

Module Name:    src
Committed By:   mellon
Date:           Tue Mar 30 00:12:15 UTC 1999

Modified Files:
        src/usr.sbin/dhcp/client: dhclient.c
        src/usr.sbin/dhcp/server: dhcpd.c
Log Message:
Resolve conflicts in pl20a merge.