K 10
svn:author
V 4
nyan
K 8
svn:date
V 27
2000-09-30T15:58:27.000000Z
K 7
svn:log
V 131
Merged from following changes.

sys/conf/options.i386	1.132.2.4
sys/i386/conf/GENERIC	1.246.2.12
sys/i386/i386/machdep.c	1.385.2.8

END