Provide a more robust experience for users with horrible network hardware (me).
svn path=/nixpkgs/trunk/; revision=10931
svn path=/nixpkgs/trunk/; revision=8412