Module Name:	basesrc
Committed By:	mellon
Date:		Sat Jun 24 06:57:06 UTC 2000

Modified Files:
	basesrc/usr.sbin/dhcp/common: options.c
	basesrc/usr.sbin/dhcp/server: confpars.c

Log Message:
Merge latest version, fix conflicts.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/common/options.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/server/confpars.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.