52454339af
(for userland bits) and vendor-sys/opensolaris (for kernel bits) and flatten the trees. Discussed with: peter, jb, gnn