Patch by Rickard Nilsson. svn path=/nixpkgs/trunk/; revision=33328
svn path=/nixpkgs/trunk/; revision=33315