Merged revisions 79977 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79977 | antoine.pitrou | 2010-04-12 00:32:39 +0200 (lun., 12 avril 2010) | 4 lines

  Issue #8374: Update the internal alias table in the :mod:`locale` module
  to cover recent locale changes and additions.
........

Misc/NEWS

@@ -312,6 +312,9 @@ C-API
 Library
 -------
 
+- Issue #8374: Update the internal alias table in the :mod:`locale` module
+  to cover recent locale changes and additions.
+
 - Issue #8321: Give access to OpenSSL version numbers from the `ssl` module,
   using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO`
   and `ssl.OPENSSL_VERSION_NUMBER`.

Tools/i18n/makelocalealias.py

@@ -9,7 +9,7 @@
 import locale
 
 # Location of the alias file
-LOCALE_ALIAS = '/usr/lib/X11/locale/locale.alias'
+LOCALE_ALIAS = '/usr/share/X11/locale/locale.alias'
 
 def parse(filename):