svn path=/nixpkgs/trunk/; revision=24478
Patch by Karn Kallio svn path=/nixpkgs/trunk/; revision=23983