Merge changes from Solaris OS/Net source
164 files changed