* 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:
Eelco Dolstra 2009-04-26 17:30:22 +00:00
parent 914f2d6cf6
commit 39ab6f252a

Diff content is not available