OpenIndiana/oi-userland — pull request #64 by xen0l (2013-07-04 11:14:05+00:00)
Title: Oi/hipster

Conflict fixed, should be OK now.