* Repairing some mergeinfo that got screwed up by the cherrypick in
r14605. svn path=/nixpkgs/branches/stdenv-updates/; revision=15321
This commit is contained in:
parent
914f2d6cf6
commit
39ab6f252a