Cherry-pick ^/nixpkgs/branches/glib-2.30@31417 svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32943