socat somehow breaks the build, disable it for now
Disable socat
Merge branch 'oi/hipster' of https://github.com/OpenIndiana/oi-userland into oi/hipster

Conflicts:
	components/components.ignore
Merge pull request #64 from xen0l/oi/hipster

Oi/hipster