Solaris branch

Pulling in branch following discussion on rcpp-core list