Fix bad merge of solaris patch
2 files changed