delphij 9524ac9a04 Re-apply onnv-gate revisions 7994 and 8986 (corresponds to FreeBSD ...

revision 200726 and 200727).  It looks like that the two revisions
were not applied in the right sequence, I found this when comparing
with the OpenSolaris code.

MFC after:	3 days
Reviewed by:	mm@

2010-01-07 20:10:22 +00:00

..

opensolaris

Re-apply onnv-gate revisions 7994 and 8986 (corresponds to FreeBSD

2010-01-07 20:10:22 +00:00