K 10
svn:author
V 4
nyan
K 8
svn:date
V 27
2001-03-09T10:04:21.000000Z
K 7
svn:log
V 88
Merged from sys/i386/conf/GENERIC revision 1.246.2.22 and 1.246.2.23.

Approved by:	jkh

END