svn path=/nixpkgs/trunk/; revision=28418
svn path=/nixpkgs/trunk/; revision=28172
Patch supplied by Vladimír Čunát. Thanks. svn path=/nixpkgs/trunk/; revision=26648