This comes from:
svn diff ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.
trunk@18255 comes from the last time I updated stdenv-updates from trunk.
svn path=/nixpkgs/stdenv-updates2/; revision=18272
* Build the PC speaker as a module. This allows people who are
annoyed by beeps (e.g. users of Dell Latitude D6xx laptops) to get
rid of them :-)
svn path=/nixpkgs/trunk/; revision=15983
