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