Merge branch 'master' into HEAD

Conflicts:
	pkgs/development/libraries/freetype/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
module_init_tools: fix "insmod.static cannot find -lc"
:multiple-outputs:
glibc-locales: setup prefix-path differently
:multiple-outputs:
glib doesn't produce doc output (check later)
perl/ssleay: fix openssl prefix
This is quite ugly, but I found no other way.

:multiple-outputs:
nodejs: explicitly put openssl in buildInputs

the linker won't find it otherwise :multiple-outputs:
ppp: fix purity patch on :multiple-outputs:
texlive: fix dependency on libX11 (perhaps fix libX11?)