Merge Harald Böhme's solaris patches
1 file changed