* elf/rtld.c [DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args):

diff --git a/ChangeLog b/ChangeLog
index 2855a78b274154e62c50c9be81c79b9d2f5ff7d6..7c012c43c5281d8c7be26895e58ccc308b3c1e7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -155,7 +155,7 @@
 
 2005-09-29  Alfred M. Szmidt  <ams@gnu.org>
 
-       * elf/rtld.c [! DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args):
+       * elf/rtld.c [DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args):
        Don't use attribute_relro.
 
 2005-09-29  Roland McGrath  <roland@redhat.com>

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 1934f15632f1ba3dc73e83a30d308160c5527957..5c6f3e6b82ee49654a24422d375d890227c3184f 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-29  Ulrich Drepper  <drepper@redhat.com>
+
+       * locales/en_US: Fix postal_fmt.
+       * locales/es_US: Update LC_ADDRESS info from en_US.
+       Reported by FrankTang@gmail.com.
+
 2005-09-25  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #811]

diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index 7aaa09953a6b8a31d36272b5adf0bbb483a09561..b2ad72d5ce7f00c5d41fd59c5b5c47601518a095 100644 (file)
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -151,7 +151,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0068>/
 <U0020><U0025><U0073><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
-<U004E><U0025><U0025><U0054><U0020><U0025><U007A><U0025>/
+<U004E><U0025><U0054><U002C><U0020><U0025><U0053><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U0055><U0053><U0041>"
 country_post  "<U0055><U0053><U0041>"

diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index 0b12c6e203b764092d5f818c2cd8ef597919a0c3..85e9d50ae8aa85ee836c33f51ac1743fb6e165e4 100644 (file)
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -2220,12 +2220,16 @@ name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
 END LC_NAME
 
 LC_ADDRESS
-postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
-<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
-<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
-<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0068>/
+<U0020><U0025><U0073><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0054><U002C><U0020><U0025><U0053><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_name  "<U0055><U0053><U0041>"
+country_post  "<U0055><U0053><U0041>"
 country_ab2   "<U0055><U0053>"
 country_ab3   "<U0055><U0053><U0041>"
 country_num   840
+country_car   "<U0055><U0053><U0041>"
+country_isbn  0
 END LC_ADDRESS