Merge branch 'staging' into v/modular

Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
This commit is contained in:
Vladimír Čunát
2014-08-31 12:23:18 +02:00
767 changed files with 19114 additions and 13711 deletions
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
dontPatchShebangs = true;
meta = {
description = "GNU Libtool, a generic library support script";
description = "Generic library support script";
longDescription = ''
GNU libtool is a generic library support script. Libtool hides