Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
cert-file-path-max.patch
cert-file.patch
darwin-arch.patch
default.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
gnu.patch
hurd-target.patch
kfreebsd-gnu.patch