Lluís Batlle i Rossell 6d15eabdc1 Merging from trunk (the callPackage change) ... svn path=/nixpkgs/branches/stdenv-updates/; revision=22915		2010-08-03 08:14:13 +00:00
..
4.5	Merging from trunk.	2010-08-02 15:48:19 +00:00
4.6	Merging from trunk.	2010-08-02 15:48:19 +00:00
4.7	Merging from trunk (the callPackage change)	2010-08-03 08:14:13 +00:00