* Merge with Debian unstable; remaining Ubuntu changes: - debian/default.path: Add /etc/gconf/gconf.xml.system to the search path, which is were 8.10 kept some system wide gconf settings. This is deprecated, but required for backwards compatibility. - 01_xml-gettext-domain.patch: Support calling gettext at runtime, see patch header for details. - 02_gconf2-pk-default-path.patch: Set Ubuntu location of gconf defaults (gconf.xml.system → gconf.xml.defaults). Renamed from 05_from_vuntz_gconf2-pk-default-path.patch. * debian/patches/01_xml-gettext-domain.patch: - Include bind_textdomain_codeset calls, to avoid crashes with non-UTF 8 locales. - Use g_intern_string() instead of g_strdup() to save some memory. - Thanks to Matthias Clasen for these improvements! * debian/control.in: Bump gconf-defaults-service conflicts/replaces to libgconf2-4 to the Ubuntu version.