Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that

well


svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
This commit is contained in:
Lluís Batlle i Rossell
2010-05-25 20:38:18 +00:00
58 changed files with 1265 additions and 250 deletions