OpenSolaris. Our local diffs to these files in HEAD already contain all
these changes (and in fact seem to be based on these versions of the files).
It seems the vendor branch just has older versions somehow.
OpenSolaris. This commit resets files to match the versions in the
OpenSolaris tree as of 2008/04/10.
The changes in this import from the previous import are the ones that
will subsequently re-applied to take files off the vendor branch. This
is unfortunately necessary because the Solaris developers won't allow
FreeBSD support #ifdefs in their source code because that creates
'dead code' (stuff that they never compile).
