Merge commit 'flameeyes/opensolaris'