[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r7311 - in /trunk: libc/ libc/bits/ libc/ctype/ libc/debug/ libc/elf/ libc/grp/ libc/iconvdata/ libc/include/ libc/include/r...



Author: joseph
Date: Tue Nov 11 07:56:28 2008
New Revision: 7311

Log:
Merge changes between r7165 and r7310 from /fsf/trunk.

Added:
    trunk/libc/elf/tst-tls18.c
      - copied unchanged from r7310, fsf/trunk/libc/elf/tst-tls18.c
    trunk/libc/elf/tst-tlsmod18a.c
      - copied unchanged from r7310, fsf/trunk/libc/elf/tst-tlsmod18a.c
    trunk/libc/localedata/si_LK.in
      - copied unchanged from r7310, fsf/trunk/libc/localedata/si_LK.in
    trunk/libc/po/id.po
      - copied unchanged from r7310, fsf/trunk/libc/po/id.po
    trunk/libc/resource/bug-ulimit1.c
      - copied unchanged from r7310, fsf/trunk/libc/resource/bug-ulimit1.c
Modified:
    trunk/libc/ChangeLog
    trunk/libc/NEWS
    trunk/libc/bits/libc-tsd.h
    trunk/libc/ctype/ctype-info.c
    trunk/libc/debug/getgroups_chk.c
    trunk/libc/elf/Makefile
    trunk/libc/elf/dl-tls.c
    trunk/libc/grp/initgroups.c
    trunk/libc/iconvdata/gconv-modules
    trunk/libc/include/ctype.h
    trunk/libc/include/rpc/rpc.h
    trunk/libc/include/stdio.h
    trunk/libc/locale/global-locale.c
    trunk/libc/locale/lc-ctype.c
    trunk/libc/locale/localeinfo.h
    trunk/libc/locale/uselocale.c
    trunk/libc/localedata/ChangeLog
    trunk/libc/localedata/Makefile
    trunk/libc/localedata/locales/af_ZA
    trunk/libc/localedata/locales/ar_SA
    trunk/libc/localedata/locales/be_BY
    trunk/libc/localedata/locales/bs_BA
    trunk/libc/localedata/locales/ca_AD
    trunk/libc/localedata/locales/ca_ES
    trunk/libc/localedata/locales/crh_UA
    trunk/libc/localedata/locales/cs_CZ
    trunk/libc/localedata/locales/da_DK
    trunk/libc/localedata/locales/de_AT
    trunk/libc/localedata/locales/de_BE
    trunk/libc/localedata/locales/de_CH
    trunk/libc/localedata/locales/de_DE
    trunk/libc/localedata/locales/de_LU
    trunk/libc/localedata/locales/el_CY
    trunk/libc/localedata/locales/el_GR
    trunk/libc/localedata/locales/en_AU
    trunk/libc/localedata/locales/en_BW
    trunk/libc/localedata/locales/en_CA
    trunk/libc/localedata/locales/en_DK
    trunk/libc/localedata/locales/en_GB
    trunk/libc/localedata/locales/en_IE
    trunk/libc/localedata/locales/en_NG
    trunk/libc/localedata/locales/en_NZ
    trunk/libc/localedata/locales/en_ZA
    trunk/libc/localedata/locales/en_ZW
    trunk/libc/localedata/locales/es_AR
    trunk/libc/localedata/locales/es_BO
    trunk/libc/localedata/locales/es_CL
    trunk/libc/localedata/locales/es_CO
    trunk/libc/localedata/locales/es_CR
    trunk/libc/localedata/locales/es_DO
    trunk/libc/localedata/locales/es_EC
    trunk/libc/localedata/locales/es_ES
    trunk/libc/localedata/locales/es_GT
    trunk/libc/localedata/locales/es_HN
    trunk/libc/localedata/locales/es_MX
    trunk/libc/localedata/locales/es_NI
    trunk/libc/localedata/locales/es_PA
    trunk/libc/localedata/locales/es_PE
    trunk/libc/localedata/locales/es_PR
    trunk/libc/localedata/locales/es_PY
    trunk/libc/localedata/locales/es_SV
    trunk/libc/localedata/locales/es_UY
    trunk/libc/localedata/locales/es_VE
    trunk/libc/localedata/locales/eu_ES
    trunk/libc/localedata/locales/fa_IR
    trunk/libc/localedata/locales/fi_FI
    trunk/libc/localedata/locales/fo_FO
    trunk/libc/localedata/locales/fr_BE
    trunk/libc/localedata/locales/fr_CA
    trunk/libc/localedata/locales/fr_CH
    trunk/libc/localedata/locales/fr_FR
    trunk/libc/localedata/locales/fr_LU
    trunk/libc/localedata/locales/fy_DE
    trunk/libc/localedata/locales/fy_NL
    trunk/libc/localedata/locales/ga_IE
    trunk/libc/localedata/locales/gd_GB
    trunk/libc/localedata/locales/gl_ES
    trunk/libc/localedata/locales/gv_GB
    trunk/libc/localedata/locales/ha_NG
    trunk/libc/localedata/locales/he_IL
    trunk/libc/localedata/locales/hr_HR
    trunk/libc/localedata/locales/hsb_DE
    trunk/libc/localedata/locales/hu_HU
    trunk/libc/localedata/locales/id_ID
    trunk/libc/localedata/locales/ig_NG
    trunk/libc/localedata/locales/ik_CA
    trunk/libc/localedata/locales/is_IS
    trunk/libc/localedata/locales/iso14651_t1_common
    trunk/libc/localedata/locales/it_CH
    trunk/libc/localedata/locales/it_IT
    trunk/libc/localedata/locales/iu_CA
    trunk/libc/localedata/locales/iw_IL
    trunk/libc/localedata/locales/kk_KZ
    trunk/libc/localedata/locales/kl_GL
    trunk/libc/localedata/locales/ko_KR
    trunk/libc/localedata/locales/ku_TR
    trunk/libc/localedata/locales/kw_GB
    trunk/libc/localedata/locales/ky_KG
    trunk/libc/localedata/locales/lg_UG
    trunk/libc/localedata/locales/li_BE
    trunk/libc/localedata/locales/li_NL
    trunk/libc/localedata/locales/lt_LT
    trunk/libc/localedata/locales/lv_LV
    trunk/libc/localedata/locales/mg_MG
    trunk/libc/localedata/locales/mk_MK
    trunk/libc/localedata/locales/mn_MN
    trunk/libc/localedata/locales/nb_NO
    trunk/libc/localedata/locales/nds_DE
    trunk/libc/localedata/locales/nds_NL
    trunk/libc/localedata/locales/nl_BE
    trunk/libc/localedata/locales/nl_NL
    trunk/libc/localedata/locales/nr_ZA
    trunk/libc/localedata/locales/nso_ZA
    trunk/libc/localedata/locales/pa_PK
    trunk/libc/localedata/locales/pl_PL
    trunk/libc/localedata/locales/pt_BR
    trunk/libc/localedata/locales/pt_PT
    trunk/libc/localedata/locales/ru_RU
    trunk/libc/localedata/locales/ru_UA
    trunk/libc/localedata/locales/rw_RW
    trunk/libc/localedata/locales/se_NO
    trunk/libc/localedata/locales/shs_CA
    trunk/libc/localedata/locales/sk_SK
    trunk/libc/localedata/locales/sl_SI
    trunk/libc/localedata/locales/sr_ME
    trunk/libc/localedata/locales/sr_RS
    trunk/libc/localedata/locales/sr_RS@latin
    trunk/libc/localedata/locales/ss_ZA
    trunk/libc/localedata/locales/st_ZA
    trunk/libc/localedata/locales/sv_FI
    trunk/libc/localedata/locales/sv_SE
    trunk/libc/localedata/locales/tg_TJ
    trunk/libc/localedata/locales/tk_TM
    trunk/libc/localedata/locales/tl_PH
    trunk/libc/localedata/locales/tn_ZA
    trunk/libc/localedata/locales/tr_CY
    trunk/libc/localedata/locales/tr_TR
    trunk/libc/localedata/locales/ts_ZA
    trunk/libc/localedata/locales/tt_RU@iqtelif
    trunk/libc/localedata/locales/ur_PK
    trunk/libc/localedata/locales/ve_ZA
    trunk/libc/localedata/locales/wa_BE
    trunk/libc/localedata/locales/wo_SN
    trunk/libc/localedata/locales/xh_ZA
    trunk/libc/localedata/locales/yo_NG
    trunk/libc/localedata/locales/zu_ZA
    trunk/libc/localedata/tests-mbwc/dat_mbtowc.c
    trunk/libc/malloc/malloc.c
    trunk/libc/math/tgmath.h
    trunk/libc/misc/hsearch_r.c
    trunk/libc/misc/syslog.c
    trunk/libc/nptl/ChangeLog
    trunk/libc/nptl/pthread_mutex_lock.c
    trunk/libc/nptl/pthread_mutex_timedlock.c
    trunk/libc/nptl/pthread_mutex_trylock.c
    trunk/libc/nptl/pthread_mutex_unlock.c
    trunk/libc/nptl/sysdeps/pthread/gai_misc.h
    trunk/libc/nptl/sysdeps/pthread/malloc-machine.h
    trunk/libc/nptl/sysdeps/s390/tls.h
    trunk/libc/po/lt.po
    trunk/libc/posix/bits/unistd.h
    trunk/libc/posix/spawnattr_getschedparam.c
    trunk/libc/resolv/res_query.c
    trunk/libc/resolv/res_send.c
    trunk/libc/resource/Makefile
    trunk/libc/sunrpc/rpc_main.c
    trunk/libc/sunrpc/rpc_thread.c
    trunk/libc/sysdeps/mach/hurd/bits/libc-tsd.h
    trunk/libc/sysdeps/mach/hurd/malloc-machine.h
    trunk/libc/sysdeps/powerpc/elf/rtld-global-offsets.sym
    trunk/libc/sysdeps/powerpc/powerpc32/dl-machine.c
    trunk/libc/sysdeps/s390/bits/atomic.h
    trunk/libc/sysdeps/s390/s390-64/dl-trampoline.S
    trunk/libc/sysdeps/unix/sysv/linux/eventfd.c
    trunk/libc/sysdeps/unix/sysv/linux/ulimit.c
    trunk/ports/sysdeps/hppa/configure
    trunk/ports/sysdeps/hppa/elf/configure

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Tue Nov 11 07:56:28 2008
@@ -1,3 +1,151 @@
+2008-11-03  Martin Schwidefsky  <schwidefsky@xxxxxxxxxx>
+
+	* sysdeps/s390/s390-64/dl-trampoline.S (_dl_runtime_profile): Use the
+	correct instruction to remove the stack frame.
+
+2008-11-03  Michael Matz  <matz@xxxxxxx>
+
+	* sysdeps/s390/bits/atomic.h (__arch_compare_and_exchange_val_32_acq,
+	__arch_compare_and_exchange_val_64_acq): Add "memory" clobber.
+
+2008-11-07  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* include/stdio.h (__builtin_fwrite, __builtin_fwrite_unlocked):
+	Remove.
+
+	* bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_address,
+	__libc_tsd_get, __libc_tsd_set): Add TYPE argument, use it as the type
+	of the thread variable instead of void *.
+	* sysdeps/mach/hurd/bits/libc-tsd.h (__libc_tsd_define,
+	__libc_tsd_address, __libc_tsd_get, __libc_tsd_set): Likewise.
+	* include/ctype.h (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
+	__libc_tsd_define arguments.
+	(__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): Adjust
+	__libc_tsd_address arguments.  Remove union hack.
+	* include/rpc/rpc.h (RPC_VARS): Adjust __libc_tsd_define arguments.
+	* sunrpc/rpc_thread.c (RPC_VARS): Likewise.
+	(__rpc_thread_destroy, rpc_thread_multi, __rpc_thread_variables):
+	Adjust __libc_tsd_{set,get} arguments.
+	* ctype/ctype-info.c (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
+	__libc_tsd_define arguments.
+	* locale/uselocale.c (__uselocale): Adjust __libc_tsd_{set,get}
+	arguments.
+	* locale/lc-ctype.c (_nl_postload_ctype): Likewise.
+	* locale/global-locale.c (__libc_tsd_LOCALE): Adjust type.
+	(LOCALE): Adjust __libc_tsd_define arguments.
+	* locale/localeinfo.h (_NL_CURRENT_LOCALE): Adjust __libc_tsd_get
+	arguments.
+	(LOCALE): Adjust __libc_tsd_define arguments.
+	* sysdeps/mach/hurd/malloc-machine.h (MALLOC): Adjust __libc_tsd_define
+	arguments.
+	(tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get}
+	arguments.
+
+2008-11-02  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* malloc/malloc.c (public_rEALLOc): When new arena is used, copy
+	really all bytes.  Patch by Denys Vlasenko <dvlasenk@xxxxxxxxxx>.
+
+2008-11-01  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #6966]
+	* misc/hsearch_r.c (hsearch_r): Fix secondary hash function.
+
+2008-10-24  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+	    Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* math/tgmath.h (__floating_type): Use __builtin_classify_type in
+	definition for GCC 3.1 and later.
+
+2008-10-31  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* elf/dl-tls.c (__tls_get_addr): After calling _dl_update_slotinfo
+	refetch dtv, as it might have changed.
+	* elf/Makefile: Add rules to build and run tst-tls18.
+	* elf/tst-tls18.c: New test.
+	* elf/tst-tlsmod18a.c: New file.
+
+2008-09-09  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
+
+	[BZ #6875]
+	* iconvdata/gconv-modules: Add LATIN9 as an alias to ISO-8859-15.
+
+2008-10-31  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #6867]
+	* sysdeps/powerpc/elf/rtld-global-offsets.sym: Fix typo.
+
+	[BZ #6919]
+	* posix/spawnattr_getschedparam.c (posix_spawnattr_getschedparam):
+	Fix length of copy operation.
+
+2008-10-02  Pierre Habouzit <madcoder@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/eventfd.c (eventfd): Use the eventfd2 syscall
+	and fix its calling convention.
+
+2008-10-07  Andreas Schwab  <schwab@xxxxxxx>
+
+	[BZ #6942]
+	* resolv/res_send.c (send_vc): Fix last change.
+	(send_dg): Align here as well.
+
+2008-10-31  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/ulimit.c (__ulimit): Handle UL_GETFSIZE
+	return value in case rlimit is RLIM_INFINITY.
+
+	[BZ #6947]
+	* sysdeps/unix/sysv/linux/ulimit.c (__ulimit): Fix return value
+	for UL_SETFSIZE.
+	* resource/Makefile (tests): Add bug-ulimit1.
+	* resource/bug-ulimit1.c: New file.
+
+	[BZ #6974]
+	* sunrpc/rpc_main.c (mkfile_output): Properly handle filename
+	without dot.  Properly terminate the string with a null byte.
+	Based on a patch by Aurelien Jarno <aurelien@xxxxxxxxxxx>.
+
+	[BZ #6980]
+	* debug/getgroups_chk.c (__getgroups_chk): Return EINVAL error for
+	negative sizees.
+	* posix/bits/unistd.h (getgroups): Call __getgroups_chk for
+	negative __size.
+
+	[BZ #6995]
+	* sysdeps/powerpc/powerpc32/dl-machine.c: Fix typo in message.
+
+2008-10-30  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* grp/initgroups.c (internal_getgrouplist): Don't prematurely
+	abort if there is no initgroups_dyn function.
+
+	* resolv/res_send.c (send_dg): On timeout, only return nonzero
+	result if any of the queries really provided an answer.
+
+2008-10-28  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* po/lt.po: Update from translation team.
+
+2008-10-26  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* po/id.po: Update from translation team.
+
+2008-10-24  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* resolv/res_query.c (__libc_res_nquery): Add a few casts.
+	Fix tests for existence of second reply.
+
+2008-10-23  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* po/id.po: New file.
+	Contributed by the Indonesian translation team.
+
+2008-10-22  Dmitry V. Levin  <ldv@xxxxxxxxxxxx>
+
+	* misc/syslog.c (openlog_internal): Fix __have_sock_cloexec
+	initialization.
+
 2008-10-17  Jakub Jelinek  <jakub@xxxxxxxxxx>
 
 	* elf/Makefile: Add rules to build and run tst-tls17.

Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Tue Nov 11 07:56:28 2008
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2008-9-29
+GNU C Library NEWS -- history of user-visible changes.  2008-10-31
 Copyright (C) 1992-2007, 2008 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -36,7 +36,8 @@
 * Many functions, exported and internal, now atomically set the close-on-exec
   flag when run on a sufficiently new kernel.  Implemented by Ulrich Drepper.
 
-* Sorting rules for some Indian languages (Kannada, Gurumukhi, Telugu)
+* Sorting rules for some Indian languages (Kannada, Gurumukhi, Telugu,
+  Sinhala)
   Implemented by Pravin Satpute.
 
 * New locales: sd_IN, sd_IN@devanagari, ks_IN@devanagari, ht_HT, en_AG, nl_AW.

Modified: trunk/libc/bits/libc-tsd.h
==============================================================================
--- trunk/libc/bits/libc-tsd.h (original)
+++ trunk/libc/bits/libc-tsd.h Tue Nov 11 07:56:28 2008
@@ -1,5 +1,5 @@
 /* libc-internal interface for thread-specific data.  Stub or TLS version.
-   Copyright (C) 1998,2001,02 Free Software Foundation, Inc.
+   Copyright (C) 1998,2001,2002,2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,15 +23,15 @@
 /* This file defines the following macros for accessing a small fixed
    set of thread-specific `void *' data used only internally by libc.
 
-   __libc_tsd_define(CLASS, KEY)	-- Define or declare a `void *' datum
+   __libc_tsd_define(CLASS, TYPE, KEY)	-- Define or declare a datum with TYPE
    					   for KEY.  CLASS can be `static' for
 					   keys used in only one source file,
 					   empty for global definitions, or
 					   `extern' for global declarations.
-   __libc_tsd_address(KEY)		-- Return the `void **' pointing to
+   __libc_tsd_address(TYPE, KEY)	-- Return the `TYPE *' pointing to
    					   the current thread's datum for KEY.
-   __libc_tsd_get(KEY)			-- Return the `void *' datum for KEY.
-   __libc_tsd_set(KEY, VALUE)		-- Set the datum for KEY to VALUE.
+   __libc_tsd_get(TYPE, KEY)		-- Return the `TYPE' datum for KEY.
+   __libc_tsd_set(TYPE, KEY, VALUE)	-- Set the datum for KEY to VALUE.
 
    The set of available KEY's will usually be provided as an enum,
    and contains (at least):
@@ -52,18 +52,19 @@
    translate directly into variables by macro magic.  */
 
 #if USE___THREAD
-# define __libc_tsd_define(CLASS, KEY)	\
-  CLASS __thread void *__libc_tsd_##KEY attribute_tls_model_ie;
+# define __libc_tsd_define(CLASS, TYPE, KEY)	\
+  CLASS __thread TYPE __libc_tsd_##KEY attribute_tls_model_ie;
 
-# define __libc_tsd_address(KEY)	(&__libc_tsd_##KEY)
-# define __libc_tsd_get(KEY)		(__libc_tsd_##KEY)
-# define __libc_tsd_set(KEY, VALUE)	(__libc_tsd_##KEY = (VALUE))
+# define __libc_tsd_address(TYPE, KEY)		(&__libc_tsd_##KEY)
+# define __libc_tsd_get(TYPE, KEY)		(__libc_tsd_##KEY)
+# define __libc_tsd_set(TYPE, KEY, VALUE)	(__libc_tsd_##KEY = (VALUE))
 #else
-# define __libc_tsd_define(CLASS, KEY)	CLASS void *__libc_tsd_##KEY##_data;
+# define __libc_tsd_define(CLASS, TYPE, KEY)	\
+  CLASS TYPE __libc_tsd_##KEY##_data;
 
-# define __libc_tsd_address(KEY)	(&__libc_tsd_##KEY##_data)
-# define __libc_tsd_get(KEY)		(__libc_tsd_##KEY##_data)
-# define __libc_tsd_set(KEY, VALUE)	(__libc_tsd_##KEY##_data = (VALUE))
+# define __libc_tsd_address(TYPE, KEY)		(&__libc_tsd_##KEY##_data)
+# define __libc_tsd_get(TYPE, KEY)		(__libc_tsd_##KEY##_data)
+# define __libc_tsd_set(TYPE, KEY, VALUE)	(__libc_tsd_##KEY##_data = (VALUE))
 #endif
 
 #endif	/* bits/libc-tsd.h */

Modified: trunk/libc/ctype/ctype-info.c
==============================================================================
--- trunk/libc/ctype/ctype-info.c (original)
+++ trunk/libc/ctype/ctype-info.c Tue Nov 11 07:56:28 2008
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,92,95,96,97,99,2000,02 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,95,96,97,99,2000, 2002, 2008
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,9 +21,9 @@
 #include <ctype.h>
 #include <locale/localeinfo.h>
 
-__libc_tsd_define (, CTYPE_B)
-__libc_tsd_define (, CTYPE_TOLOWER)
-__libc_tsd_define (, CTYPE_TOUPPER)
+__libc_tsd_define (, const uint16_t *, CTYPE_B)
+__libc_tsd_define (, const int32_t *, CTYPE_TOLOWER)
+__libc_tsd_define (, const int32_t *, CTYPE_TOUPPER)
 
 
 #include <shlib-compat.h>

Modified: trunk/libc/debug/getgroups_chk.c
==============================================================================
--- trunk/libc/debug/getgroups_chk.c (original)
+++ trunk/libc/debug/getgroups_chk.c Tue Nov 11 07:56:28 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,6 +23,12 @@
 int
 __getgroups_chk (int size, __gid_t list[], size_t listlen)
 {
+  if (__builtin_expect (size < 0, 0))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
   if (__builtin_expect (size * sizeof (__gid_t) > listlen, 0))
     __chk_fail ();
 

Modified: trunk/libc/elf/Makefile
==============================================================================
--- trunk/libc/elf/Makefile (original)
+++ trunk/libc/elf/Makefile Tue Nov 11 07:56:28 2008
@@ -167,7 +167,7 @@
 	 restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \
 	 circleload1 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8 \
 	 tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 tst-tls15 \
-	 tst-tls16 tst-tls17 tst-tls-dlinfo \
+	 tst-tls16 tst-tls17 tst-tls18 tst-tls-dlinfo \
 	 tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
 	 tst-dlmodcount tst-dlopenrpath tst-deep1 \
 	 tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
@@ -183,6 +183,7 @@
 endif
 tests: $(objpfx)tst-leaks1-mem
 tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		testobj1_1 failobj constload2 constload3 unloadmod \
 		dep1 dep2 dep3 dep4 vismod1 vismod2 vismod3 \
@@ -204,6 +205,7 @@
 		tst-tlsmod15a tst-tlsmod15b tst-tlsmod16a tst-tlsmod16b \
 		$(patsubst %,tst-tlsmod17a%,$(tlsmod17a-suffixes)) \
 		tst-tlsmod17b \
+		$(patsubst %,tst-tlsmod18a%,$(tlsmod18a-suffixes)) \
 		circlemod1 circlemod1a circlemod2 circlemod2a \
 		circlemod3 circlemod3a \
 		reldep8mod1 reldep8mod2 reldep8mod3 \
@@ -731,6 +733,12 @@
 $(patsubst %,$(objpfx)tst-tlsmod17a%.so,$(tlsmod17a-suffixes)): $(objpfx)tst-tlsmod17a%.so: $(objpfx)ld.so
 $(objpfx)tst-tlsmod17b.so: $(patsubst %,$(objpfx)tst-tlsmod17a%.so,$(tlsmod17a-suffixes))
 
+$(objpfx)tst-tls18: $(libdl)
+$(objpfx)tst-tls18.out: $(patsubst %,$(objpfx)tst-tlsmod18a%.so,$(tlsmod18a-suffixes))
+$(patsubst %,$(objpfx)tst-tlsmod18a%.os,$(tlsmod18a-suffixes)): $(objpfx)tst-tlsmod18a%.os : tst-tlsmod18a.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ -DN=$* -DNOT_IN_libc=1 $<
+$(patsubst %,$(objpfx)tst-tlsmod18a%.so,$(tlsmod18a-suffixes)): $(objpfx)tst-tlsmod18a%.so: $(objpfx)ld.so
+
 CFLAGS-tst-align.c = $(stack-align-test-flags)
 CFLAGS-tst-align2.c = $(stack-align-test-flags)
 CFLAGS-tst-alignmod.c = $(stack-align-test-flags)

Modified: trunk/libc/elf/dl-tls.c
==============================================================================
--- trunk/libc/elf/dl-tls.c (original)
+++ trunk/libc/elf/dl-tls.c Tue Nov 11 07:56:28 2008
@@ -756,7 +756,10 @@
   void *p;
 
   if (__builtin_expect (dtv[0].counter != GL(dl_tls_generation), 0))
-    the_map = _dl_update_slotinfo (GET_ADDR_MODULE);
+    {
+      the_map = _dl_update_slotinfo (GET_ADDR_MODULE);
+      dtv = THREAD_DTV ();
+    }
 
   p = dtv[GET_ADDR_MODULE].pointer.val;
 

Modified: trunk/libc/grp/initgroups.c
==============================================================================
--- trunk/libc/grp/initgroups.c (original)
+++ trunk/libc/grp/initgroups.c Tue Nov 11 07:56:28 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989,91,93,1996-2005,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1989,91,93,1996-2005,2006,2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -94,13 +94,8 @@
       fct = __nss_lookup_function (nip, "initgroups_dyn");
 
       if (fct == NULL)
-	{
-	  status = compat_call (nip, user, group, &start, size, groupsp,
-				limit, &errno);
-
-	  if (nss_next_action (nip, NSS_STATUS_UNAVAIL) != NSS_ACTION_CONTINUE)
-	    break;
-	}
+	status = compat_call (nip, user, group, &start, size, groupsp,
+			      limit, &errno);
       else
 	status = DL_CALL_FCT (fct, (user, group, &start, size, groupsp,
 				    limit, &errno));

Modified: trunk/libc/iconvdata/gconv-modules
==============================================================================
--- trunk/libc/iconvdata/gconv-modules (original)
+++ trunk/libc/iconvdata/gconv-modules Tue Nov 11 07:56:28 2008
@@ -1,5 +1,5 @@
 # GNU libc iconv configuration.
-# Copyright (C) 1997-2004, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1997-2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -395,6 +395,7 @@
 alias	ISO-IR-203//		ISO-8859-15//
 alias	ISO_8859-15//		ISO-8859-15//
 alias	LATIN-9//		ISO-8859-15//
+alias	LATIN9//		ISO-8859-15//
 alias	ISO_8859-15:1998//	ISO-8859-15//
 module	ISO-8859-15//		INTERNAL		ISO8859-15	1
 module	INTERNAL		ISO-8859-15//		ISO8859-15	1

Modified: trunk/libc/include/ctype.h
==============================================================================
--- trunk/libc/include/ctype.h (original)
+++ trunk/libc/include/ctype.h Tue Nov 11 07:56:28 2008
@@ -18,50 +18,35 @@
 #   define CTYPE_EXTERN_INLINE extern inline
 #  endif
 
-__libc_tsd_define (extern, CTYPE_B)
-__libc_tsd_define (extern, CTYPE_TOUPPER)
-__libc_tsd_define (extern, CTYPE_TOLOWER)
+__libc_tsd_define (extern, const uint16_t *, CTYPE_B)
+__libc_tsd_define (extern, const int32_t *, CTYPE_TOUPPER)
+__libc_tsd_define (extern, const int32_t *, CTYPE_TOLOWER)
 
 CTYPE_EXTERN_INLINE const uint16_t ** __attribute__ ((const))
 __ctype_b_loc (void)
 {
-  union
-    {
-      void **ptr;
-      const uint16_t **tablep;
-    } u;
-  u.ptr = __libc_tsd_address (CTYPE_B);
-  if (__builtin_expect (*u.tablep == NULL, 0))
-    *u.tablep = (const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128;
-  return u.tablep;
+  const uint16_t **tablep = __libc_tsd_address (const uint16_t *, CTYPE_B);
+  if (__builtin_expect (*tablep == NULL, 0))
+    *tablep = (const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128;
+  return tablep;
 }
 
 CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
 __ctype_toupper_loc (void)
 {
-  union
-    {
-      void **ptr;
-      const int32_t **tablep;
-    } u;
-  u.ptr = __libc_tsd_address (CTYPE_TOUPPER);
-  if (__builtin_expect (*u.tablep == NULL, 0))
-    *u.tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128);
-  return u.tablep;
+  const int32_t **tablep = __libc_tsd_address (const int32_t *, CTYPE_TOUPPER);
+  if (__builtin_expect (*tablep == NULL, 0))
+    *tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128);
+  return tablep;
 }
 
 CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
 __ctype_tolower_loc (void)
 {
-  union
-    {
-      void **ptr;
-      const int32_t **tablep;
-    } u;
-  u.ptr = __libc_tsd_address (CTYPE_TOLOWER);
-  if (__builtin_expect (*u.tablep == NULL, 0))
-    *u.tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128);
-  return u.tablep;
+  const int32_t **tablep = __libc_tsd_address (const int32_t *, CTYPE_TOLOWER);
+  if (__builtin_expect (*tablep == NULL, 0))
+    *tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128);
+  return tablep;
 }
 
 # endif	/* Not NOT_IN_libc.  */

Modified: trunk/libc/include/rpc/rpc.h
==============================================================================
--- trunk/libc/include/rpc/rpc.h (original)
+++ trunk/libc/include/rpc/rpc.h Tue Nov 11 07:56:28 2008
@@ -45,7 +45,7 @@
 
 extern void __rpc_thread_destroy (void);
 
-__libc_tsd_define (extern, RPC_VARS)
+__libc_tsd_define (extern, struct rpc_thread_variables *, RPC_VARS)
 
 #define RPC_THREAD_VARIABLE(x) (__rpc_thread_variables()->x)
 

Modified: trunk/libc/include/stdio.h
==============================================================================
--- trunk/libc/include/stdio.h (original)
+++ trunk/libc/include/stdio.h Tue Nov 11 07:56:28 2008
@@ -160,17 +160,6 @@
 libc_hidden_proto (__vasprintf_chk)
 libc_hidden_proto (__vdprintf_chk)
 libc_hidden_proto (__obstack_vprintf_chk)
-
-#  if !defined NOT_IN_libc && defined SHARED && defined DO_VERSIONING \
-  && !defined NO_HIDDEN
-/* Special gcc builtins.  */
-extern size_t __builtin_fwrite (const void *, size_t, size_t, void *)
-     __asm ("__GI_fwrite");
-extern size_t __builtin_fwrite_unlocked (const void *, size_t, size_t, void *)
-     __asm ("__GI_fwrite_unlocked");
-
-#  endif
-
 # endif
 
 #endif

Modified: trunk/libc/locale/global-locale.c
==============================================================================
--- trunk/libc/locale/global-locale.c (original)
+++ trunk/libc/locale/global-locale.c Tue Nov 11 07:56:28 2008
@@ -1,5 +1,5 @@
 /* Locale object representing the global locale controlled by setlocale.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -62,9 +62,9 @@
 #include <tls.h>
 #if HAVE___THREAD
 /* The tsd macros don't permit an initializer.  */
-__thread void *__libc_tsd_LOCALE = &_nl_global_locale;
+__thread __locale_t __libc_tsd_LOCALE = &_nl_global_locale;
 #else
-__libc_tsd_define (, LOCALE)
+__libc_tsd_define (, __locale_t, LOCALE)
 /* This is a bad kludge presuming the variable name used by the macros.
    Using typeof makes sure to barf if we do not match the macro definition.
    This ifndef is a further bad kludge for Hurd, where there is an explicit

Modified: trunk/libc/locale/lc-ctype.c
==============================================================================
--- trunk/libc/locale/lc-ctype.c (original)
+++ trunk/libc/locale/lc-ctype.c Tue Nov 11 07:56:28 2008
@@ -1,5 +1,5 @@
 /* Define current locale data for LC_CTYPE category.
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003,2005
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003,2005,2008
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -66,10 +66,11 @@
      in fact using the global locale.  */
   if (_NL_CURRENT_LOCALE == &_nl_global_locale)
     {
-      __libc_tsd_set (CTYPE_B, (void *) _nl_global_locale.__ctype_b);
-      __libc_tsd_set (CTYPE_TOUPPER,
+      __libc_tsd_set (const uint16_t *, CTYPE_B,
+		      (void *) _nl_global_locale.__ctype_b);
+      __libc_tsd_set (const int32_t *, CTYPE_TOUPPER,
 		      (void *) _nl_global_locale.__ctype_toupper);
-      __libc_tsd_set (CTYPE_TOLOWER,
+      __libc_tsd_set (const int32_t *, CTYPE_TOLOWER,
 		      (void *) _nl_global_locale.__ctype_tolower);
     }
 

Modified: trunk/libc/locale/localeinfo.h
==============================================================================
--- trunk/libc/locale/localeinfo.h (original)
+++ trunk/libc/locale/localeinfo.h Tue Nov 11 07:56:28 2008
@@ -1,5 +1,6 @@
 /* Declarations for internal libc locale interfaces
-   Copyright (C) 1995-2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-2003, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -203,9 +204,9 @@
 
 /* This fetches the thread-local locale_t pointer, either one set with
    uselocale or &_nl_global_locale.  */
-#define _NL_CURRENT_LOCALE	((__locale_t) __libc_tsd_get (LOCALE))
+#define _NL_CURRENT_LOCALE	(__libc_tsd_get (__locale_t, LOCALE))
 #include <bits/libc-tsd.h>
-__libc_tsd_define (extern, LOCALE)
+__libc_tsd_define (extern, __locale_t, LOCALE)
 
 
 /* For static linking it is desireable to avoid always linking in the code

Modified: trunk/libc/locale/uselocale.c
==============================================================================
--- trunk/libc/locale/uselocale.c (original)
+++ trunk/libc/locale/uselocale.c Tue Nov 11 07:56:28 2008
@@ -1,5 +1,5 @@
 /* uselocale -- fetch and set the current per-thread locale
-   Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@
     {
       const locale_t locobj
 	= newloc == LC_GLOBAL_LOCALE ? &_nl_global_locale : newloc;
-      __libc_tsd_set (LOCALE, locobj);
+      __libc_tsd_set (__locale_t, LOCALE, locobj);
 
 #ifdef NL_CURRENT_INDIRECT
       /* Now we must update all the per-category thread-local variables to
@@ -63,9 +63,11 @@
 #endif
 
       /* Update the special tsd cache of some locale data.  */
-      __libc_tsd_set (CTYPE_B, (void *) locobj->__ctype_b);
-      __libc_tsd_set (CTYPE_TOLOWER, (void *) locobj->__ctype_tolower);
-      __libc_tsd_set (CTYPE_TOUPPER, (void *) locobj->__ctype_toupper);
+      __libc_tsd_set (const uint16_t *, CTYPE_B, (void *) locobj->__ctype_b);
+      __libc_tsd_set (const int32_t *, CTYPE_TOLOWER,
+		      (void *) locobj->__ctype_tolower);
+      __libc_tsd_set (const int32_t *, CTYPE_TOUPPER,
+		      (void *) locobj->__ctype_toupper);
     }
 
   return oldloc == &_nl_global_locale ? LC_GLOBAL_LOCALE : oldloc;

Modified: trunk/libc/localedata/ChangeLog
==============================================================================
--- trunk/libc/localedata/ChangeLog (original)
+++ trunk/libc/localedata/ChangeLog Tue Nov 11 07:56:28 2008
@@ -1,3 +1,144 @@
+2008-10-31  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #6920]
+	* locales/af_ZA: Fix %%z and %%T and postal_fmts.
+	* locales/ar_SA: Likewise.
+	* locales/be_BY: Likewise.
+	* locales/bs_BA: Likewise.
+	* locales/ca_AD: Likewise.
+	* locales/ca_ES: Likewise.
+	* locales/crh_UA: Likewise.
+	* locales/cs_CZ: Likewise.
+	* locales/da_DK: Likewise.
+	* locales/de_AT: Likewise.
+	* locales/de_BE: Likewise.
+	* locales/de_CH: Likewise.
+	* locales/de_DE: Likewise.
+	* locales/de_LU: Likewise.
+	* locales/el_CY: Likewise.
+	* locales/el_GR: Likewise.
+	* locales/en_AU: Likewise.
+	* locales/en_BW: Likewise.
+	* locales/en_CA: Likewise.
+	* locales/en_DK: Likewise.
+	* locales/en_GB: Likewise.
+	* locales/en_IE: Likewise.
+	* locales/en_NG: Likewise.
+	* locales/en_NZ: Likewise.
+	* locales/en_ZA: Likewise.
+	* locales/en_ZW: Likewise.
+	* locales/es_AR: Likewise.
+	* locales/es_BO: Likewise.
+	* locales/es_CL: Likewise.
+	* locales/es_CO: Likewise.
+	* locales/es_CR: Likewise.
+	* locales/es_DO: Likewise.
+	* locales/es_EC: Likewise.
+	* locales/es_ES: Likewise.
+	* locales/es_GT: Likewise.
+	* locales/es_HN: Likewise.
+	* locales/es_MX: Likewise.
+	* locales/es_NI: Likewise.
+	* locales/es_PA: Likewise.
+	* locales/es_PE: Likewise.
+	* locales/es_PR: Likewise.
+	* locales/es_PY: Likewise.
+	* locales/es_SV: Likewise.
+	* locales/es_UY: Likewise.
+	* locales/es_VE: Likewise.
+	* locales/eu_ES: Likewise.
+	* locales/fa_IR: Likewise.
+	* locales/fi_FI: Likewise.
+	* locales/fo_FO: Likewise.
+	* locales/fr_BE: Likewise.
+	* locales/fr_CA: Likewise.
+	* locales/fr_CH: Likewise.
+	* locales/fr_FR: Likewise.
+	* locales/fr_LU: Likewise.
+	* locales/fy_DE: Likewise.
+	* locales/fy_NL: Likewise.
+	* locales/ga_IE: Likewise.
+	* locales/gd_GB: Likewise.
+	* locales/gl_ES: Likewise.
+	* locales/gv_GB: Likewise.
+	* locales/ha_NG: Likewise.
+	* locales/he_IL: Likewise.
+	* locales/hr_HR: Likewise.
+	* locales/hsb_DE: Likewise.
+	* locales/hu_HU: Likewise.
+	* locales/id_ID: Likewise.
+	* locales/ig_NG: Likewise.
+	* locales/ik_CA: Likewise.
+	* locales/is_IS: Likewise.
+	* locales/it_CH: Likewise.
+	* locales/it_IT: Likewise.
+	* locales/iu_CA: Likewise.
+	* locales/iw_IL: Likewise.
+	* locales/kk_KZ: Likewise.
+	* locales/kl_GL: Likewise.
+	* locales/ko_KR: Likewise.
+	* locales/ku_TR: Likewise.
+	* locales/kw_GB: Likewise.
+	* locales/ky_KG: Likewise.
+	* locales/lg_UG: Likewise.
+	* locales/li_BE: Likewise.
+	* locales/li_NL: Likewise.
+	* locales/lt_LT: Likewise.
+	* locales/lv_LV: Likewise.
+	* locales/mg_MG: Likewise.
+	* locales/mk_MK: Likewise.
+	* locales/mn_MN: Likewise.
+	* locales/nb_NO: Likewise.
+	* locales/nds_DE: Likewise.
+	* locales/nds_NL: Likewise.
+	* locales/nl_BE: Likewise.
+	* locales/nl_NL: Likewise.
+	* locales/nr_ZA: Likewise.
+	* locales/nso_ZA: Likewise.
+	* locales/pa_PK: Likewise.
+	* locales/pl_PL: Likewise.
+	* locales/pt_BR: Likewise.
+	* locales/pt_PT: Likewise.
+	* locales/ru_RU: Likewise.
+	* locales/ru_UA: Likewise.
+	* locales/rw_RW: Likewise.
+	* locales/se_NO: Likewise.
+	* locales/shs_CA: Likewise.
+	* locales/sk_SK: Likewise.
+	* locales/sl_SI: Likewise.
+	* locales/sr_ME: Likewise.
+	* locales/sr_RS: Likewise.
+	* locales/sr_RS@latin: Likewise.
+	* locales/ss_ZA: Likewise.
+	* locales/st_ZA: Likewise.
+	* locales/sv_FI: Likewise.
+	* locales/sv_SE: Likewise.
+	* locales/tg_TJ: Likewise.
+	* locales/tk_TM: Likewise.
+	* locales/tl_PH: Likewise.
+	* locales/tn_ZA: Likewise.
+	* locales/tr_CY: Likewise.
+	* locales/tr_TR: Likewise.
+	* locales/ts_ZA: Likewise.
+	* locales/tt_RU@iqtelif: Likewise.
+	* locales/ur_PK: Likewise.
+	* locales/ve_ZA: Likewise.
+	* locales/wa_BE: Likewise.
+	* locales/wo_SN: Likewise.
+	* locales/xh_ZA: Likewise.
+	* locales/yo_NG: Likewise.
+	* locales/zu_ZA: Likewise.
+	Patch by Pekka Vuorela <pvuorela@xxxxxxxxx>.
+
+	* tests-mbwc/dat_mbtowc.c (tst_mbtowc_loc): Avoid some warnings.
+
+	[BZ #6968]
+	* locales/iso14651_t1_common: Add support for Sinhala.
+	* localedata/si_LK.in: New file.
+	Patch by harshula@xxxxxxxxxx
+	* Makefile (test-input): Add si_LK.UTF-8.
+	(LOCALES): Likewise.
+
 2008-09-17  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* locales/en_GB: Set first weekday and workday to 2.

Modified: trunk/libc/localedata/Makefile
==============================================================================
--- trunk/libc/localedata/Makefile (original)
+++ trunk/libc/localedata/Makefile Tue Nov 11 07:56:28 2008
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1996-2003, 2005, 2007, 2008 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -52,7 +52,8 @@
 	     tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
 	     tst-ctype tst-wctype tst-langinfo tst-numeric
 test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
-	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8
+	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
+	      si_LK.UTF-8
 test-input-data = $(addsuffix .in, $(basename $(test-input)))
 test-output := $(foreach s, .out .xout, \
 			 $(addsuffix $s, $(basename $(test-input))))
@@ -149,7 +150,7 @@
 	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
 	   vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 \
 	   tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 \
-	   ja_JP.UTF-8
+	   ja_JP.UTF-8 si_LK.UTF-8
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \
 		    sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)

Modified: trunk/libc/localedata/locales/af_ZA
==============================================================================
--- trunk/libc/localedata/locales/af_ZA (original)
+++ trunk/libc/localedata/locales/af_ZA Tue Nov 11 07:56:28 2008
@@ -226,7 +226,7 @@
 LC_ADDRESS
 % Representation of postal addresses (minus the addressee's name) in South
 % Africa. (Ignored for now)
-% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives -
 %
 % "firm name",
 % "end of line",
@@ -252,7 +252,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 
 % Country name in Afrikaans - "Suid-Afrika"

Modified: trunk/libc/localedata/locales/ar_SA
==============================================================================
--- trunk/libc/localedata/locales/ar_SA (original)
+++ trunk/libc/localedata/locales/ar_SA Tue Nov 11 07:56:28 2008
@@ -381,7 +381,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0053><U0041>"
 country_ab3 "<U0053><U0041><U0055>"

Modified: trunk/libc/localedata/locales/be_BY
==============================================================================
--- trunk/libc/localedata/locales/be_BY (original)
+++ trunk/libc/localedata/locales/be_BY Tue Nov 11 07:56:28 2008
@@ -175,7 +175,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0042><U0059>"
 country_ab3 "<U0042><U004C><U0052>"

Modified: trunk/libc/localedata/locales/bs_BA
==============================================================================
--- trunk/libc/localedata/locales/bs_BA (original)
+++ trunk/libc/localedata/locales/bs_BA Tue Nov 11 07:56:28 2008
@@ -229,7 +229,7 @@
 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><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0042><U0041>"
 country_ab3 "<U0042><U0049><U0048>"

Modified: trunk/libc/localedata/locales/ca_AD
==============================================================================
--- trunk/libc/localedata/locales/ca_AD (original)
+++ trunk/libc/localedata/locales/ca_AD Tue Nov 11 07:56:28 2008
@@ -86,7 +86,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0041><U0044>"
 country_ab3 "<U0041><U004E><U0044>"

Modified: trunk/libc/localedata/locales/ca_ES
==============================================================================
--- trunk/libc/localedata/locales/ca_ES (original)
+++ trunk/libc/localedata/locales/ca_ES Tue Nov 11 07:56:28 2008
@@ -167,7 +167,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0045><U0053>"
 country_ab3 "<U0045><U0053><U0050>"

Modified: trunk/libc/localedata/locales/crh_UA
==============================================================================
--- trunk/libc/localedata/locales/crh_UA (original)
+++ trunk/libc/localedata/locales/crh_UA Tue Nov 11 07:56:28 2008
@@ -219,7 +219,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0055><U0041>"
 country_ab3 "<U0055><U004B><U0052>"

Modified: trunk/libc/localedata/locales/cs_CZ
==============================================================================
--- trunk/libc/localedata/locales/cs_CZ (original)
+++ trunk/libc/localedata/locales/cs_CZ Tue Nov 11 07:56:28 2008
@@ -2488,7 +2488,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U010C><U0065><U0073><U006B><U00E1><U0020><U0072><U0065><U0070><U0075><U0062><U006C><U0069><U006B><U0061>"
 country_post  "<U0043><U005A>"

Modified: trunk/libc/localedata/locales/da_DK
==============================================================================
--- trunk/libc/localedata/locales/da_DK (original)
+++ trunk/libc/localedata/locales/da_DK Tue Nov 11 07:56:28 2008
@@ -247,7 +247,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0044><U004B>"
 country_ab3 "<U0044><U004E><U004B>"

Modified: trunk/libc/localedata/locales/de_AT
==============================================================================
--- trunk/libc/localedata/locales/de_AT (original)
+++ trunk/libc/localedata/locales/de_AT Tue Nov 11 07:56:28 2008
@@ -149,7 +149,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0041><U0054>"
 country_ab3 "<U0041><U0055><U0054>"

Modified: trunk/libc/localedata/locales/de_BE
==============================================================================
--- trunk/libc/localedata/locales/de_BE (original)
+++ trunk/libc/localedata/locales/de_BE Tue Nov 11 07:56:28 2008
@@ -142,7 +142,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0042><U0045>"
 country_ab3 "<U0042><U0045><U004C>"

Modified: trunk/libc/localedata/locales/de_CH
==============================================================================
--- trunk/libc/localedata/locales/de_CH (original)
+++ trunk/libc/localedata/locales/de_CH Tue Nov 11 07:56:28 2008
@@ -149,7 +149,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0043><U0048>"
 country_ab3 "<U0043><U0048><U0045>"

Modified: trunk/libc/localedata/locales/de_DE
==============================================================================
--- trunk/libc/localedata/locales/de_DE (original)
+++ trunk/libc/localedata/locales/de_DE Tue Nov 11 07:56:28 2008
@@ -184,7 +184,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U0044><U0065><U0075><U0074><U0073><U0063><U0068><U006C>/
 <U0061><U006E><U0064>"

Modified: trunk/libc/localedata/locales/de_LU
==============================================================================
--- trunk/libc/localedata/locales/de_LU (original)
+++ trunk/libc/localedata/locales/de_LU Tue Nov 11 07:56:28 2008
@@ -148,7 +148,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U004C><U0055>"
 country_ab3 "<U004C><U0055><U0058>"

Modified: trunk/libc/localedata/locales/el_CY
==============================================================================
--- trunk/libc/localedata/locales/el_CY (original)
+++ trunk/libc/localedata/locales/el_CY Tue Nov 11 07:56:28 2008
@@ -96,7 +96,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0043><U0059>"
 country_ab3 "<U0043><U0059><U0050>"

Modified: trunk/libc/localedata/locales/el_GR
==============================================================================
--- trunk/libc/localedata/locales/el_GR (original)
+++ trunk/libc/localedata/locales/el_GR Tue Nov 11 07:56:28 2008
@@ -169,7 +169,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0047><U0052>"
 country_ab3 "<U0047><U0052><U0043>"

Modified: trunk/libc/localedata/locales/en_AU
==============================================================================
--- trunk/libc/localedata/locales/en_AU (original)
+++ trunk/libc/localedata/locales/en_AU Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0041><U0055>"
 country_ab3 "<U0041><U0055><U0053>"

Modified: trunk/libc/localedata/locales/en_BW
==============================================================================
--- trunk/libc/localedata/locales/en_BW (original)
+++ trunk/libc/localedata/locales/en_BW Tue Nov 11 07:56:28 2008
@@ -109,7 +109,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0042><U0057>"
 country_ab3 "<U0042><U0057><U0041>"

Modified: trunk/libc/localedata/locales/en_CA
==============================================================================
--- trunk/libc/localedata/locales/en_CA (original)
+++ trunk/libc/localedata/locales/en_CA Tue Nov 11 07:56:28 2008
@@ -165,7 +165,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"

Modified: trunk/libc/localedata/locales/en_DK
==============================================================================
--- trunk/libc/localedata/locales/en_DK (original)
+++ trunk/libc/localedata/locales/en_DK Tue Nov 11 07:56:28 2008
@@ -150,7 +150,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0044><U004B>"
 country_ab3 "<U0044><U004E><U004B>"

Modified: trunk/libc/localedata/locales/en_GB
==============================================================================
--- trunk/libc/localedata/locales/en_GB (original)
+++ trunk/libc/localedata/locales/en_GB Tue Nov 11 07:56:28 2008
@@ -156,7 +156,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0047><U0042>"
 country_ab3   "<U0047><U0042><U0052>"

Modified: trunk/libc/localedata/locales/en_IE
==============================================================================
--- trunk/libc/localedata/locales/en_IE (original)
+++ trunk/libc/localedata/locales/en_IE Tue Nov 11 07:56:28 2008
@@ -148,7 +148,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0049><U0045>"
 country_ab3   "<U0049><U0052><U004C>"

Modified: trunk/libc/localedata/locales/en_NG
==============================================================================
--- trunk/libc/localedata/locales/en_NG (original)
+++ trunk/libc/localedata/locales/en_NG Tue Nov 11 07:56:28 2008
@@ -222,7 +222,7 @@
 LC_ADDRESS
 % Representation of postal addresses (minus the addressee's name) in South
 % Africa. (Ignored for now)
-% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives -
 %
 % "firm name",
 % "end of line",
@@ -248,7 +248,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 
 % Country name in English - "Nigeria"

Modified: trunk/libc/localedata/locales/en_NZ
==============================================================================
--- trunk/libc/localedata/locales/en_NZ (original)
+++ trunk/libc/localedata/locales/en_NZ Tue Nov 11 07:56:28 2008
@@ -151,7 +151,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U004E><U005A>"
 country_ab3   "<U004E><U005A><U004C>"

Modified: trunk/libc/localedata/locales/en_ZA
==============================================================================
--- trunk/libc/localedata/locales/en_ZA (original)
+++ trunk/libc/localedata/locales/en_ZA Tue Nov 11 07:56:28 2008
@@ -289,7 +289,7 @@
 LC_ADDRESS
 % Representation of postal addresses (minus the addressee's name) in South
 % Africa. (Ignored for now)
-% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives -
 %
 % "firm name",
 % "end of line",
@@ -315,7 +315,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 
 % Country name in English - "South Africa"

Modified: trunk/libc/localedata/locales/en_ZW
==============================================================================
--- trunk/libc/localedata/locales/en_ZW (original)
+++ trunk/libc/localedata/locales/en_ZW Tue Nov 11 07:56:28 2008
@@ -108,7 +108,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U005A><U0057>"
 country_ab3   "<U005A><U0057><U0045>"

Modified: trunk/libc/localedata/locales/es_AR
==============================================================================
--- trunk/libc/localedata/locales/es_AR (original)
+++ trunk/libc/localedata/locales/es_AR Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0041><U0052>"
 country_ab3   "<U0041><U0052><U0047>"

Modified: trunk/libc/localedata/locales/es_BO
==============================================================================
--- trunk/libc/localedata/locales/es_BO (original)
+++ trunk/libc/localedata/locales/es_BO Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0042><U004F>"
 country_ab3   "<U0042><U004F><U004C>"

Modified: trunk/libc/localedata/locales/es_CL
==============================================================================
--- trunk/libc/localedata/locales/es_CL (original)
+++ trunk/libc/localedata/locales/es_CL Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0043><U004C>"
 country_ab3   "<U0043><U0048><U004C>"

Modified: trunk/libc/localedata/locales/es_CO
==============================================================================
--- trunk/libc/localedata/locales/es_CO (original)
+++ trunk/libc/localedata/locales/es_CO Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0043><U004F>"
 country_ab3   "<U0043><U004F><U004C>"

Modified: trunk/libc/localedata/locales/es_CR
==============================================================================
--- trunk/libc/localedata/locales/es_CR (original)
+++ trunk/libc/localedata/locales/es_CR Tue Nov 11 07:56:28 2008
@@ -145,7 +145,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0043><U0052>"
 country_ab3   "<U0043><U0052><U0049>"

Modified: trunk/libc/localedata/locales/es_DO
==============================================================================
--- trunk/libc/localedata/locales/es_DO (original)
+++ trunk/libc/localedata/locales/es_DO Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0044><U004F>"
 country_ab3   "<U0044><U004F><U004D>"

Modified: trunk/libc/localedata/locales/es_EC
==============================================================================
--- trunk/libc/localedata/locales/es_EC (original)
+++ trunk/libc/localedata/locales/es_EC Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0045><U0043>"
 country_ab3   "<U0045><U0043><U0055>"

Modified: trunk/libc/localedata/locales/es_ES
==============================================================================
--- trunk/libc/localedata/locales/es_ES (original)
+++ trunk/libc/localedata/locales/es_ES Tue Nov 11 07:56:28 2008
@@ -157,7 +157,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0045><U0053>"
 country_ab3   "<U0045><U0053><U0050>"

Modified: trunk/libc/localedata/locales/es_GT
==============================================================================
--- trunk/libc/localedata/locales/es_GT (original)
+++ trunk/libc/localedata/locales/es_GT Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0047><U0054>"
 country_ab3   "<U0047><U0054><U004D>"

Modified: trunk/libc/localedata/locales/es_HN
==============================================================================
--- trunk/libc/localedata/locales/es_HN (original)
+++ trunk/libc/localedata/locales/es_HN Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0048><U004E>"
 country_ab3   "<U0048><U004E><U0044>"

Modified: trunk/libc/localedata/locales/es_MX
==============================================================================
--- trunk/libc/localedata/locales/es_MX (original)
+++ trunk/libc/localedata/locales/es_MX Tue Nov 11 07:56:28 2008
@@ -151,7 +151,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U004D><U0058>"
 country_ab3   "<U004D><U0045><U0058>"

Modified: trunk/libc/localedata/locales/es_NI
==============================================================================
--- trunk/libc/localedata/locales/es_NI (original)
+++ trunk/libc/localedata/locales/es_NI Tue Nov 11 07:56:28 2008
@@ -143,7 +143,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U004E><U0049>"
 country_ab3   "<U004E><U0049><U0043>"

Modified: trunk/libc/localedata/locales/es_PA
==============================================================================
--- trunk/libc/localedata/locales/es_PA (original)
+++ trunk/libc/localedata/locales/es_PA Tue Nov 11 07:56:28 2008
@@ -151,7 +151,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0050><U0041>"
 country_ab3   "<U0050><U0041><U004E>"

Modified: trunk/libc/localedata/locales/es_PE
==============================================================================
--- trunk/libc/localedata/locales/es_PE (original)
+++ trunk/libc/localedata/locales/es_PE Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0050><U0045>"
 country_ab3   "<U0050><U0045><U0052>"

Modified: trunk/libc/localedata/locales/es_PR
==============================================================================
--- trunk/libc/localedata/locales/es_PR (original)
+++ trunk/libc/localedata/locales/es_PR Tue Nov 11 07:56:28 2008
@@ -139,7 +139,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0050><U0052>"
 country_ab3   "<U0050><U0052><U0049>"

Modified: trunk/libc/localedata/locales/es_PY
==============================================================================
--- trunk/libc/localedata/locales/es_PY (original)
+++ trunk/libc/localedata/locales/es_PY Tue Nov 11 07:56:28 2008
@@ -151,7 +151,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0050><U0059>"
 country_ab3   "<U0050><U0052><U0059>"

Modified: trunk/libc/localedata/locales/es_SV
==============================================================================
--- trunk/libc/localedata/locales/es_SV (original)
+++ trunk/libc/localedata/locales/es_SV Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0053><U0056>"
 country_ab3   "<U0053><U004C><U0056>"

Modified: trunk/libc/localedata/locales/es_UY
==============================================================================
--- trunk/libc/localedata/locales/es_UY (original)
+++ trunk/libc/localedata/locales/es_UY Tue Nov 11 07:56:28 2008
@@ -151,7 +151,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0055><U0059>"
 country_ab3   "<U0055><U0052><U0059>"

Modified: trunk/libc/localedata/locales/es_VE
==============================================================================
--- trunk/libc/localedata/locales/es_VE (original)
+++ trunk/libc/localedata/locales/es_VE Tue Nov 11 07:56:28 2008
@@ -152,7 +152,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0056><U0045>"
 country_ab3   "<U0056><U0045><U004E>"

Modified: trunk/libc/localedata/locales/eu_ES
==============================================================================
--- trunk/libc/localedata/locales/eu_ES (original)
+++ trunk/libc/localedata/locales/eu_ES Tue Nov 11 07:56:28 2008
@@ -160,7 +160,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0045><U0053>"
 country_ab3 "<U0045><U0053><U0050>"

Modified: trunk/libc/localedata/locales/fa_IR
==============================================================================
--- trunk/libc/localedata/locales/fa_IR (original)
+++ trunk/libc/localedata/locales/fa_IR Tue Nov 11 07:56:28 2008
@@ -465,7 +465,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name   "<U0627><U06CC><U0631><U0627><U0646>"
 country_ab2    "<U0049><U0052>"

Modified: trunk/libc/localedata/locales/fi_FI
==============================================================================
--- trunk/libc/localedata/locales/fi_FI (original)
+++ trunk/libc/localedata/locales/fi_FI Tue Nov 11 07:56:28 2008
@@ -236,7 +236,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0046><U0049>"
 country_ab3 "<U0046><U0049><U004E>"

Modified: trunk/libc/localedata/locales/fo_FO
==============================================================================
--- trunk/libc/localedata/locales/fo_FO (original)
+++ trunk/libc/localedata/locales/fo_FO Tue Nov 11 07:56:28 2008
@@ -137,7 +137,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0046><U004F>"
 country_ab3 "<U0046><U0052><U004F>"

Modified: trunk/libc/localedata/locales/fr_BE
==============================================================================
--- trunk/libc/localedata/locales/fr_BE (original)
+++ trunk/libc/localedata/locales/fr_BE Tue Nov 11 07:56:28 2008
@@ -150,7 +150,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0042><U0045>"
 country_ab3 "<U0042><U0045><U004C>"

Modified: trunk/libc/localedata/locales/fr_CA
==============================================================================
--- trunk/libc/localedata/locales/fr_CA (original)
+++ trunk/libc/localedata/locales/fr_CA Tue Nov 11 07:56:28 2008
@@ -144,7 +144,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"

Modified: trunk/libc/localedata/locales/fr_CH
==============================================================================
--- trunk/libc/localedata/locales/fr_CH (original)
+++ trunk/libc/localedata/locales/fr_CH Tue Nov 11 07:56:28 2008
@@ -136,7 +136,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0043><U0048>"
 country_ab3 "<U0043><U0048><U0045>"

Modified: trunk/libc/localedata/locales/fr_FR
==============================================================================
--- trunk/libc/localedata/locales/fr_FR (original)
+++ trunk/libc/localedata/locales/fr_FR Tue Nov 11 07:56:28 2008
@@ -172,7 +172,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0046><U0052>"
 country_ab3 "<U0046><U0052><U0041>"

Modified: trunk/libc/localedata/locales/fr_LU
==============================================================================
--- trunk/libc/localedata/locales/fr_LU (original)
+++ trunk/libc/localedata/locales/fr_LU Tue Nov 11 07:56:28 2008
@@ -149,7 +149,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U004C><U0055>"
 country_ab3 "<U004C><U0055><U0058>"

Modified: trunk/libc/localedata/locales/fy_DE
==============================================================================
--- trunk/libc/localedata/locales/fy_DE (original)
+++ trunk/libc/localedata/locales/fy_DE Tue Nov 11 07:56:28 2008
@@ -40,7 +40,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_post  "<U0044>"
 country_ab2   "<U0044><U0045>"

Modified: trunk/libc/localedata/locales/fy_NL
==============================================================================
--- trunk/libc/localedata/locales/fy_NL (original)
+++ trunk/libc/localedata/locales/fy_NL Tue Nov 11 07:56:28 2008
@@ -122,7 +122,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U004E><U004C>"
 country_ab3 "<U004E><U004C><U0044>"

Modified: trunk/libc/localedata/locales/ga_IE
==============================================================================
--- trunk/libc/localedata/locales/ga_IE (original)
+++ trunk/libc/localedata/locales/ga_IE Tue Nov 11 07:56:28 2008
@@ -151,7 +151,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0049><U0045>"
 country_ab3 "<U0049><U0052><U004C>"

Modified: trunk/libc/localedata/locales/gd_GB
==============================================================================
--- trunk/libc/localedata/locales/gd_GB (original)
+++ trunk/libc/localedata/locales/gd_GB Tue Nov 11 07:56:28 2008
@@ -36,7 +36,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 
 country_name "<U0042><U0072><U0065><U0061><U0074><U0061><U0069><U006E><U006E><U0020><U004D><U0068><U00F2><U0072>"

Modified: trunk/libc/localedata/locales/gl_ES
==============================================================================
--- trunk/libc/localedata/locales/gl_ES (original)
+++ trunk/libc/localedata/locales/gl_ES Tue Nov 11 07:56:28 2008
@@ -150,7 +150,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0045><U0053>"
 country_ab3 "<U0045><U0053><U0050>"

Modified: trunk/libc/localedata/locales/gv_GB
==============================================================================
--- trunk/libc/localedata/locales/gv_GB (original)
+++ trunk/libc/localedata/locales/gv_GB Tue Nov 11 07:56:28 2008
@@ -165,7 +165,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0047><U0042>"
 country_ab3 "<U0047><U0042><U0052>"

Modified: trunk/libc/localedata/locales/ha_NG
==============================================================================
--- trunk/libc/localedata/locales/ha_NG (original)
+++ trunk/libc/localedata/locales/ha_NG Tue Nov 11 07:56:28 2008
@@ -239,7 +239,7 @@
 LC_ADDRESS
 % Representation of postal addresses (minus the addressee's name) in South
 % Africa. (Ignored for now)
-% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives -
 %
 % "firm name",
 % "end of line",
@@ -265,7 +265,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 
 % Country name in Hausa - "Nigeria"

Modified: trunk/libc/localedata/locales/he_IL
==============================================================================
--- trunk/libc/localedata/locales/he_IL (original)
+++ trunk/libc/localedata/locales/he_IL Tue Nov 11 07:56:28 2008
@@ -157,7 +157,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0049><U004C>"
 country_ab3 "<U0049><U0053><U0052>"

Modified: trunk/libc/localedata/locales/hr_HR
==============================================================================
--- trunk/libc/localedata/locales/hr_HR (original)
+++ trunk/libc/localedata/locales/hr_HR Tue Nov 11 07:56:28 2008
@@ -2242,7 +2242,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0048><U0052>"
 country_ab3 "<U0048><U0052><U0056>"

Modified: trunk/libc/localedata/locales/hsb_DE
==============================================================================
--- trunk/libc/localedata/locales/hsb_DE (original)
+++ trunk/libc/localedata/locales/hsb_DE Tue Nov 11 07:56:28 2008
@@ -2199,7 +2199,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U004E><U011B><U006D><U0073><U006B><U0061>"
 country_post  "<U0044>"

Modified: trunk/libc/localedata/locales/hu_HU
==============================================================================
--- trunk/libc/localedata/locales/hu_HU (original)
+++ trunk/libc/localedata/locales/hu_HU Tue Nov 11 07:56:28 2008
@@ -551,7 +551,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0048><U0055>"
 country_ab3 "<U0048><U0055><U004E>"

Modified: trunk/libc/localedata/locales/id_ID
==============================================================================
--- trunk/libc/localedata/locales/id_ID (original)
+++ trunk/libc/localedata/locales/id_ID Tue Nov 11 07:56:28 2008
@@ -154,7 +154,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0049><U0044>"
 country_ab3 "<U0049><U0044><U004E>"

Modified: trunk/libc/localedata/locales/ig_NG
==============================================================================
--- trunk/libc/localedata/locales/ig_NG (original)
+++ trunk/libc/localedata/locales/ig_NG Tue Nov 11 07:56:28 2008
@@ -436,7 +436,7 @@
 LC_ADDRESS
 % Representation of postal addresses (minus the addressee's name) in South
 % Africa. (Ignored for now)
-% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives -
 %
 % "firm name",
 % "end of line",
@@ -462,7 +462,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 
 % Country name in Igbo - "Nigeria"

Modified: trunk/libc/localedata/locales/ik_CA
==============================================================================
--- trunk/libc/localedata/locales/ik_CA (original)
+++ trunk/libc/localedata/locales/ik_CA Tue Nov 11 07:56:28 2008
@@ -228,7 +228,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"

Modified: trunk/libc/localedata/locales/is_IS
==============================================================================
--- trunk/libc/localedata/locales/is_IS (original)
+++ trunk/libc/localedata/locales/is_IS Tue Nov 11 07:56:28 2008
@@ -2258,7 +2258,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0049><U0053>"
 country_ab3 "<U0049><U0053><U004C>"

Modified: trunk/libc/localedata/locales/iso14651_t1_common
==============================================================================
--- trunk/libc/localedata/locales/iso14651_t1_common (original)
+++ trunk/libc/localedata/locales/iso14651_t1_common Tue Nov 11 07:56:28 2008
@@ -65,6 +65,7 @@
 script <TELUGU>
 script <GURUMUKHI>
 script <KANNADA>
+script <SINHALA>
 
 # Déclaration des symboles internes / Declaration of internal symbols
 #
@@ -3968,6 +3969,89 @@
 <U0CD6> <k-ai_lenght_mark>;<BAS>;<MIN>;IGNORE
 <U0CBC> IGNORE;<KNKT>;<MIN>;IGNORE
 
+order_start <SINHALA>;forward;forward;forward;forward,position
+# SCCII Part 1 : Collation Sequence (SLS1134)
+<U0DF4> <U0DF4>;<BAS>;<MIN>;IGNORE
+<U0D85> <U0D85>;<BAS>;<MIN>;IGNORE
+<U0D86> <U0D86>;<BAS>;<MIN>;IGNORE
+<U0D87> <U0D87>;<BAS>;<MIN>;IGNORE
+<U0D88> <U0D88>;<BAS>;<MIN>;IGNORE
+<U0D89> <U0D89>;<BAS>;<MIN>;IGNORE
+<U0D8A> <U0D8A>;<BAS>;<MIN>;IGNORE
+<U0D8B> <U0D8B>;<BAS>;<MIN>;IGNORE
+<U0D8C> <U0D8C>;<BAS>;<MIN>;IGNORE
+<U0D8D> <U0D8D>;<BAS>;<MIN>;IGNORE
+<U0D8E> <U0D8E>;<BAS>;<MIN>;IGNORE
+<U0D8F> <U0D8F>;<BAS>;<MIN>;IGNORE
+<U0D90> <U0D90>;<BAS>;<MIN>;IGNORE
+<U0D91> <U0D91>;<BAS>;<MIN>;IGNORE
+<U0D92> <U0D92>;<BAS>;<MIN>;IGNORE
+<U0D93> <U0D93>;<BAS>;<MIN>;IGNORE
+<U0D94> <U0D94>;<BAS>;<MIN>;IGNORE
+<U0D95> <U0D95>;<BAS>;<MIN>;IGNORE
+<U0D96> <U0D96>;<BAS>;<MIN>;IGNORE
+<U0D82> <U0D82>;<BAS>;<MIN>;IGNORE
+<U0D83> <U0D83>;<BAS>;<MIN>;IGNORE
+<U0D9A> <U0D9A>;<BAS>;<MIN>;IGNORE
+<U0D9B> <U0D9B>;<BAS>;<MIN>;IGNORE
+<U0D9C> <U0D9C>;<BAS>;<MIN>;IGNORE
+<U0D9D> <U0D9D>;<BAS>;<MIN>;IGNORE
+<U0D9E> <U0D9E>;<BAS>;<MIN>;IGNORE
+<U0D9F> <U0D9F>;<BAS>;<MIN>;IGNORE
+<U0DA0> <U0DA0>;<BAS>;<MIN>;IGNORE
+<U0DA1> <U0DA1>;<BAS>;<MIN>;IGNORE
+<U0DA2> <U0DA2>;<BAS>;<MIN>;IGNORE
+<U0DA3> <U0DA3>;<BAS>;<MIN>;IGNORE
+<U0DA5> <U0DA5>;<BAS>;<MIN>;IGNORE
+<U0DA4> <U0DA4>;<BAS>;<MIN>;IGNORE
+<U0DA6> <U0DA6>;<BAS>;<MIN>;IGNORE
+<U0DA7> <U0DA7>;<BAS>;<MIN>;IGNORE
+<U0DA8> <U0DA8>;<BAS>;<MIN>;IGNORE
+<U0DA9> <U0DA9>;<BAS>;<MIN>;IGNORE
+<U0DAA> <U0DAA>;<BAS>;<MIN>;IGNORE
+<U0DAB> <U0DAB>;<BAS>;<MIN>;IGNORE
+<U0DAC> <U0DAC>;<BAS>;<MIN>;IGNORE
+<U0DAD> <U0DAD>;<BAS>;<MIN>;IGNORE
+<U0DAE> <U0DAE>;<BAS>;<MIN>;IGNORE
+<U0DAF> <U0DAF>;<BAS>;<MIN>;IGNORE
+<U0DB0> <U0DB0>;<BAS>;<MIN>;IGNORE
+<U0DB1> <U0DB1>;<BAS>;<MIN>;IGNORE
+<U0DB3> <U0DB3>;<BAS>;<MIN>;IGNORE
+<U0DB4> <U0DB4>;<BAS>;<MIN>;IGNORE
+<U0DB5> <U0DB5>;<BAS>;<MIN>;IGNORE
+<U0DB6> <U0DB6>;<BAS>;<MIN>;IGNORE
+<U0DB7> <U0DB7>;<BAS>;<MIN>;IGNORE
+<U0DB8> <U0DB8>;<BAS>;<MIN>;IGNORE
+<U0DB9> <U0DB9>;<BAS>;<MIN>;IGNORE
+<U0DBA> <U0DBA>;<BAS>;<MIN>;IGNORE
+<U0DBB> <U0DBB>;<BAS>;<MIN>;IGNORE
+<U0DBD> <U0DBD>;<BAS>;<MIN>;IGNORE
+<U0DC0> <U0DC0>;<BAS>;<MIN>;IGNORE
+<U0DC1> <U0DC1>;<BAS>;<MIN>;IGNORE
+<U0DC2> <U0DC2>;<BAS>;<MIN>;IGNORE
+<U0DC3> <U0DC3>;<BAS>;<MIN>;IGNORE
+<U0DC4> <U0DC4>;<BAS>;<MIN>;IGNORE
+<U0DC5> <U0DC5>;<BAS>;<MIN>;IGNORE
+<U0DC6> <U0DC6>;<BAS>;<MIN>;IGNORE
+<U0DCF> <U0DCF>;<BAS>;<MIN>;IGNORE
+<U0DD0> <U0DD0>;<BAS>;<MIN>;IGNORE
+<U0DD1> <U0DD1>;<BAS>;<MIN>;IGNORE
+<U0DD2> <U0DD2>;<BAS>;<MIN>;IGNORE
+<U0DD3> <U0DD3>;<BAS>;<MIN>;IGNORE
+<U0DD4> <U0DD4>;<BAS>;<MIN>;IGNORE
+<U0DD6> <U0DD6>;<BAS>;<MIN>;IGNORE
+<U0DD8> <U0DD8>;<BAS>;<MIN>;IGNORE
+<U0DF2> <U0DF2>;<BAS>;<MIN>;IGNORE
+<U0DDF> <U0DDF>;<BAS>;<MIN>;IGNORE
+<U0DF3> <U0DF3>;<BAS>;<MIN>;IGNORE
+<U0DD9> <U0DD9>;<BAS>;<MIN>;IGNORE
+<U0DDA> <U0DDA>;<BAS>;<MIN>;IGNORE
+<U0DDB> <U0DDB>;<BAS>;<MIN>;IGNORE
+<U0DDC> <U0DDC>;<BAS>;<MIN>;IGNORE
+<U0DDD> <U0DDD>;<BAS>;<MIN>;IGNORE
+<U0DDE> <U0DDE>;<BAS>;<MIN>;IGNORE
+<U0DCA> <U0DCA>;<BAS>;<MIN>;IGNORE
+
 order_end
 
 END LC_COLLATE

Modified: trunk/libc/localedata/locales/it_CH
==============================================================================
--- trunk/libc/localedata/locales/it_CH (original)
+++ trunk/libc/localedata/locales/it_CH Tue Nov 11 07:56:28 2008
@@ -129,7 +129,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0043><U0048>"
 country_ab3 "<U0043><U0048><U0045>"

Modified: trunk/libc/localedata/locales/it_IT
==============================================================================
--- trunk/libc/localedata/locales/it_IT (original)
+++ trunk/libc/localedata/locales/it_IT Tue Nov 11 07:56:28 2008
@@ -153,7 +153,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0049><U0054>"
 country_ab3 "<U0049><U0054><U0041>"

Modified: trunk/libc/localedata/locales/iu_CA
==============================================================================
--- trunk/libc/localedata/locales/iu_CA (original)
+++ trunk/libc/localedata/locales/iu_CA Tue Nov 11 07:56:28 2008
@@ -34,7 +34,7 @@
 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><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 % FIXME country_name "Canada" in inuktitut ?
 % FIXME country_post "CA" for Canada ? 

Modified: trunk/libc/localedata/locales/iw_IL
==============================================================================
--- trunk/libc/localedata/locales/iw_IL (original)
+++ trunk/libc/localedata/locales/iw_IL Tue Nov 11 07:56:28 2008
@@ -156,7 +156,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0049><U004C>"
 country_ab3 "<U0049><U0053><U0052>"

Modified: trunk/libc/localedata/locales/kk_KZ
==============================================================================
--- trunk/libc/localedata/locales/kk_KZ (original)
+++ trunk/libc/localedata/locales/kk_KZ Tue Nov 11 07:56:28 2008
@@ -259,6 +259,6 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 END LC_ADDRESS

Modified: trunk/libc/localedata/locales/kl_GL
==============================================================================
--- trunk/libc/localedata/locales/kl_GL (original)
+++ trunk/libc/localedata/locales/kl_GL Tue Nov 11 07:56:28 2008
@@ -138,7 +138,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0047><U004C>"
 country_ab3 "<U0047><U0052><U004C>"

Modified: trunk/libc/localedata/locales/ko_KR
==============================================================================
--- trunk/libc/localedata/locales/ko_KR (original)
+++ trunk/libc/localedata/locales/ko_KR Tue Nov 11 07:56:28 2008
@@ -6240,7 +6240,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U004B><U0052>"
 country_ab3 "<U004B><U004F><U0052>"

Modified: trunk/libc/localedata/locales/ku_TR
==============================================================================
--- trunk/libc/localedata/locales/ku_TR (original)
+++ trunk/libc/localedata/locales/ku_TR Tue Nov 11 07:56:28 2008
@@ -197,7 +197,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 % TODO
 country_name	"<U0054><U0075><U0072><U006B><U0065><U0079>"

Modified: trunk/libc/localedata/locales/kw_GB
==============================================================================
--- trunk/libc/localedata/locales/kw_GB (original)
+++ trunk/libc/localedata/locales/kw_GB Tue Nov 11 07:56:28 2008
@@ -157,7 +157,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U0047><U0042>"
 country_ab3 "<U0047><U0042><U0052>"

Modified: trunk/libc/localedata/locales/ky_KG
==============================================================================
--- trunk/libc/localedata/locales/ky_KG (original)
+++ trunk/libc/localedata/locales/ky_KG Tue Nov 11 07:56:28 2008
@@ -199,7 +199,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2 "<U004B><U0059>"
 country_ab3 "<U004B><U0059><U0052>"

Modified: trunk/libc/localedata/locales/lg_UG
==============================================================================
--- trunk/libc/localedata/locales/lg_UG (original)
+++ trunk/libc/localedata/locales/lg_UG Tue Nov 11 07:56:28 2008
@@ -302,10 +302,10 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 % Representation of postal addresses (minus the addressee's name) in Uganda.
-% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives -
 % "firm name",
 % "end of line",
 % "C/O address",

Modified: trunk/libc/localedata/locales/li_BE
==============================================================================
--- trunk/libc/localedata/locales/li_BE (original)
+++ trunk/libc/localedata/locales/li_BE Tue Nov 11 07:56:28 2008
@@ -39,7 +39,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 %FIXME country_name "Belgie"
 country_post  "<U0042>"

Modified: trunk/libc/localedata/locales/li_NL
==============================================================================
--- trunk/libc/localedata/locales/li_NL (original)
+++ trunk/libc/localedata/locales/li_NL Tue Nov 11 07:56:28 2008
@@ -39,7 +39,7 @@
 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>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 %FIXME country_name "Nederland"
 country_post  "<U004E><U004C>"

Modified: trunk/libc/localedata/locales/lt_LT

[... 2286 lines stripped ...]