Merge Harald Böhme's solaris patches
13 files changed