Merge branch 'oi/hipster' of github.com:OpenIndiana/oi-userland into categories