Merge with FreeBSD, revision 1.30 (markm):