Merge commit 'f4d51098686d961fc03dc5aa327619d0af3c9dcd'
Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg