Merge branch 'gcc_fix' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'gcc_fix' of https://github.com/pyhalov/oi-userland into oi/hipster
xscreensaver - modify Makefile POST_UNPACK to find gconf headers
Merge branch 'perl_mediator_errors' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'wdiff' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'php' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'gcc_fix' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'nginx' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'gzip' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge https://github.com/OpenIndiana/oi-userland into oi/hipster
Add joe - text editor - to OI/Userland

JOE is a full featured terminal-based screen editor which is distributed under
the GNU General Public License (GPL). JOE has been around since 1988
and comes standard with many Linux distributions. Author: Joseph Allen.
Merge branch 'oi/hipster' of github.com:OpenIndiana/oi-userland into oi/hipster
joe: deliver configuration files in /etc
Merge pull request #180 from pyhalov/joe

joe: deliver configuration files in /etc
Revert "xscreensaver - modify Makefile POST_UNPACK to find gconf headers"

This reverts commit d95af5f578bad8e2abae0b8d35e061b4bd4c0835.
Merge pull request #181 from pyhalov/correct_xscreensaver

Revert "xscreensaver - modify Makefile POST_UNPACK to find gconf headers...
Update pigz to 2.3
Add sqlite-3.7.17
Switch LINKER to gcc for correct LD_BITS
Restore mistakenly deleted CONFIGURE_OPTIONS for xscreensaver