TMP

Conflicts:
	pkgs/stdenv/generic/default.nix
remerge to retrieve refactoring lost 10 days ago

In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix