
I had some merge problems with the system-tarball; I hope I've resolved them. svn path=/nixos/branches/stdenv-updates/; revision=24201
I had some merge problems with the system-tarball; I hope I've resolved them. svn path=/nixos/branches/stdenv-updates/; revision=24201