*** /usr/share/X11/locale/locale.dir.orig	2010-07-04 20:55:56.825779837 +0200
--- /usr/share/X11/locale/locale.dir	2010-07-04 20:56:33.416753703 +0200
***************
*** 101,107 ****
  iso8859-1/XLC_LOCALE			en_ZW.ISO8859-1
  # The EO territory doesn't exist in ISO 3166.
  # iso8859-3/XLC_LOCALE:			eo_EO.ISO8859-3
! iso8859-3/XLC_LOCALE			eo_XX.ISO8859-3
  iso8859-1/XLC_LOCALE			es_AR.ISO8859-1
  iso8859-1/XLC_LOCALE			es_BO.ISO8859-1
  iso8859-1/XLC_LOCALE			es_CL.ISO8859-1
--- 101,107 ----
  iso8859-1/XLC_LOCALE			en_ZW.ISO8859-1
  # The EO territory doesn't exist in ISO 3166.
  # iso8859-3/XLC_LOCALE:			eo_EO.ISO8859-3
! iso8859-3/XLC_LOCALE			eo.ISO8859-3
  iso8859-1/XLC_LOCALE			es_AR.ISO8859-1
  iso8859-1/XLC_LOCALE			es_BO.ISO8859-1
  iso8859-1/XLC_LOCALE			es_CL.ISO8859-1
***************
*** 353,359 ****
  en_US.UTF-8/XLC_LOCALE			en_ZW.UTF-8
  # The EO territory doesn't exist in ISO 3166.
  # en_US.UTF-8/XLC_LOCALE:			eo_EO.UTF-8
! en_US.UTF-8/XLC_LOCALE			eo_XX.UTF-8
  en_US.UTF-8/XLC_LOCALE			es_AR.UTF-8
  en_US.UTF-8/XLC_LOCALE			es_BO.UTF-8
  en_US.UTF-8/XLC_LOCALE			es_CL.UTF-8
--- 353,359 ----
  en_US.UTF-8/XLC_LOCALE			en_ZW.UTF-8
  # The EO territory doesn't exist in ISO 3166.
  # en_US.UTF-8/XLC_LOCALE:			eo_EO.UTF-8
! en_US.UTF-8/XLC_LOCALE			eo.UTF-8
  en_US.UTF-8/XLC_LOCALE			es_AR.UTF-8
  en_US.UTF-8/XLC_LOCALE			es_BO.UTF-8
  en_US.UTF-8/XLC_LOCALE			es_CL.UTF-8
***************
*** 608,614 ****
  iso8859-1/XLC_LOCALE:			en_ZW.ISO8859-1
  # The EO territory doesn't exist in ISO 3166.
  # iso8859-3/XLC_LOCALE:			eo_EO.ISO8859-3
! iso8859-3/XLC_LOCALE:			eo_XX.ISO8859-3
  iso8859-1/XLC_LOCALE:			es_AR.ISO8859-1
  iso8859-1/XLC_LOCALE:			es_BO.ISO8859-1
  iso8859-1/XLC_LOCALE:			es_CL.ISO8859-1
--- 608,614 ----
  iso8859-1/XLC_LOCALE:			en_ZW.ISO8859-1
  # The EO territory doesn't exist in ISO 3166.
  # iso8859-3/XLC_LOCALE:			eo_EO.ISO8859-3
! iso8859-3/XLC_LOCALE:			eo.ISO8859-3
  iso8859-1/XLC_LOCALE:			es_AR.ISO8859-1
  iso8859-1/XLC_LOCALE:			es_BO.ISO8859-1
  iso8859-1/XLC_LOCALE:			es_CL.ISO8859-1
***************
*** 860,866 ****
  en_US.UTF-8/XLC_LOCALE:			en_ZW.UTF-8
  # The EO territory doesn't exist in ISO 3166.
  # en_US.UTF-8/XLC_LOCALE:			eo_EO.UTF-8
! en_US.UTF-8/XLC_LOCALE:			eo_XX.UTF-8
  en_US.UTF-8/XLC_LOCALE:			es_AR.UTF-8
  en_US.UTF-8/XLC_LOCALE:			es_BO.UTF-8
  en_US.UTF-8/XLC_LOCALE:			es_CL.UTF-8
--- 860,866 ----
  en_US.UTF-8/XLC_LOCALE:			en_ZW.UTF-8
  # The EO territory doesn't exist in ISO 3166.
  # en_US.UTF-8/XLC_LOCALE:			eo_EO.UTF-8
! en_US.UTF-8/XLC_LOCALE:			eo.UTF-8
  en_US.UTF-8/XLC_LOCALE:			es_AR.UTF-8
  en_US.UTF-8/XLC_LOCALE:			es_BO.UTF-8
  en_US.UTF-8/XLC_LOCALE:			es_CL.UTF-8
*** /usr/share/X11/locale/compose.dir.orig	2010-07-04 20:53:43.557763665 +0200
--- /usr/share/X11/locale/compose.dir	2010-07-04 20:54:56.440753334 +0200
***************
*** 99,105 ****
  iso8859-1/Compose		en_ZA.ISO8859-1
  iso8859-15/Compose		en_ZA.ISO8859-15
  iso8859-1/Compose		en_ZW.ISO8859-1
! iso8859-3/Compose		eo_XX.ISO8859-3
  iso8859-1/Compose		es_AR.ISO8859-1
  iso8859-1/Compose		es_BO.ISO8859-1
  iso8859-1/Compose		es_CL.ISO8859-1
--- 99,105 ----
  iso8859-1/Compose		en_ZA.ISO8859-1
  iso8859-15/Compose		en_ZA.ISO8859-15
  iso8859-1/Compose		en_ZW.ISO8859-1
! iso8859-3/Compose		eo.ISO8859-3
  iso8859-1/Compose		es_AR.ISO8859-1
  iso8859-1/Compose		es_BO.ISO8859-1
  iso8859-1/Compose		es_CL.ISO8859-1
***************
*** 363,369 ****
  en_US.UTF-8/Compose		en_US.UTF-8
  en_US.UTF-8/Compose		en_ZA.UTF-8
  en_US.UTF-8/Compose		en_ZW.UTF-8
! en_US.UTF-8/Compose		eo_XX.UTF-8
  en_US.UTF-8/Compose		es_AR.UTF-8
  en_US.UTF-8/Compose		es_BO.UTF-8
  en_US.UTF-8/Compose		es_CL.UTF-8
--- 363,369 ----
  en_US.UTF-8/Compose		en_US.UTF-8
  en_US.UTF-8/Compose		en_ZA.UTF-8
  en_US.UTF-8/Compose		en_ZW.UTF-8
! en_US.UTF-8/Compose		eo.UTF-8
  en_US.UTF-8/Compose		es_AR.UTF-8
  en_US.UTF-8/Compose		es_BO.UTF-8
  en_US.UTF-8/Compose		es_CL.UTF-8
***************
*** 616,622 ****
  iso8859-1/Compose:		en_ZA.ISO8859-1
  iso8859-15/Compose:		en_ZA.ISO8859-15
  iso8859-1/Compose:		en_ZW.ISO8859-1
! iso8859-3/Compose:		eo_XX.ISO8859-3
  iso8859-1/Compose:		es_AR.ISO8859-1
  iso8859-1/Compose:		es_BO.ISO8859-1
  iso8859-1/Compose:		es_CL.ISO8859-1
--- 616,622 ----
  iso8859-1/Compose:		en_ZA.ISO8859-1
  iso8859-15/Compose:		en_ZA.ISO8859-15
  iso8859-1/Compose:		en_ZW.ISO8859-1
! iso8859-3/Compose:		eo.ISO8859-3
  iso8859-1/Compose:		es_AR.ISO8859-1
  iso8859-1/Compose:		es_BO.ISO8859-1
  iso8859-1/Compose:		es_CL.ISO8859-1
***************
*** 880,886 ****
  en_US.UTF-8/Compose:		en_US.UTF-8
  en_US.UTF-8/Compose:		en_ZA.UTF-8
  en_US.UTF-8/Compose:		en_ZW.UTF-8
! en_US.UTF-8/Compose:		eo_XX.UTF-8
  en_US.UTF-8/Compose:		es_AR.UTF-8
  en_US.UTF-8/Compose:		es_BO.UTF-8
  en_US.UTF-8/Compose:		es_CL.UTF-8
--- 880,886 ----
  en_US.UTF-8/Compose:		en_US.UTF-8
  en_US.UTF-8/Compose:		en_ZA.UTF-8
  en_US.UTF-8/Compose:		en_ZW.UTF-8
! en_US.UTF-8/Compose:		eo.UTF-8
  en_US.UTF-8/Compose:		es_AR.UTF-8
  en_US.UTF-8/Compose:		es_BO.UTF-8
  en_US.UTF-8/Compose:		es_CL.UTF-8