Patch courtesy of Russell O'Connor. svn path=/nixpkgs/trunk/; revision=21838
svn path=/nixpkgs/trunk/; revision=18069
svn path=/nixpkgs/trunk/; revision=11983