Log Message: Add support for Darwin. And add support for Solaris. Sorry I commit both at same time. I forgot to commit this earlier.