Revision 26483 from trunk. Somehow missed during merge. svn path=/nixpkgs/branches/stdenv-updates/; revision=28794