Import revision 76844b29fc04ced003061bba03e7f6c947ed362c from FreeBSD.

Change-Id: I5d376e1121e10536530f66e6aae1df7d96ebfcaf
2 files changed