svn path=/nixpkgs/trunk/; revision=32863
I had this patch _almost_ ready for a long long time. Now ready. svn path=/nixpkgs/trunk/; revision=14017