svn path=/nixpkgs/trunk/; revision=18014
svn path=/nixpkgs/trunk/; revision=13703
Requested by Michael Raskin. svn path=/nixpkgs/trunk/; revision=12812