[src/trunk]: src Finish merge with 1.11 (file had no 1.10.8 tag).

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9c43ebab2b5a
branches:  trunk
changeset: 508559:9c43ebab2b5a
user:      wiz <wiz%NetBSD.org@localhost>
date:      Fri Apr 13 13:07:14 2001 +0000

description:
Finish merge with 1.11 (file had no 1.10.8 tag).
Noted by itojun.