Import revision 643521d9cba4f6b4717f042e6ce8bb0c71e5a3a0 from FreeBSD.

Change-Id: I5cd6c9fd7064268ceccccaeb92a2f2408871b455
4 files changed