svn path=/nixpkgs/trunk/; revision=24064
(patch by Piotr Pietraszkiewicz) svn path=/nixpkgs/trunk/; revision=23988