Also updated some X.org packages (notably xorg-server) as well as freetype. svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
svn path=/nixpkgs/branches/stdenv-updates/; revision=13006