* Revert r32435. We'll be doing a stdenv merge in a few days, so

  let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436