* Merge r2396.

svn path=/nixpkgs/trunk/; revision=2397

pkgs/tools/graphics/exif/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "exif-0.6.9";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/libexif/exif-0.6.9.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/exif-0.6.9.tar.gz;
     md5 = "555029098386fa677c461eb249d852d7";
   };
 

pkgs/tools/graphics/graphviz/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/graphviz-2.2.tar.gz;
     md5 = "9275d30695a5c22f360acbef7b85acd3";
   };