merge cleanly right away (kde-4, kernel stuff) so it should be merged later. But the stdenv stuff is all there. svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
* Added freefont-ttf (use to provide a default OSD font for MPlayer). svn path=/nixpkgs/trunk/; revision=7241