This reverts commit af60b70e57ba79f9ebf0f944ba0698e5661bc4dc. (introduced by wrong merge strategy during git rebase) svn path=/nixpkgs/branches/stdenv-updates/; revision=9827
This reverts commit af60b70e57ba79f9ebf0f944ba0698e5661bc4dc. (introduced by wrong merge strategy during git rebase) svn path=/nixpkgs/branches/stdenv-updates/; revision=9827