###############################################################################

# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

#

diff -urp -x '*~' -x '*.orig' nls/compose.dir.pre nls/compose.dir.pre

--- nls/compose.dir.pre 2010-01-14 17:11:36.000000000 -0800

+++ nls/compose.dir.pre 2010-06-07 18:01:10.730751798 -0700

@@ -337,12 +337,12 @@ en_US.UTF-8/Compose: is_IS.UTF-8

en_US.UTF-8/Compose: it_CH.UTF-8

en_US.UTF-8/Compose: it_IT.UTF-8

en_US.UTF-8/Compose: iu_CA.UTF-8

-en_US.UTF-8/Compose: ja_JP.UTF-8

+ja_JP.UTF-8/Compose: ja_JP.UTF-8

en_US.UTF-8/Compose: ka_GE.UTF-8

en_US.UTF-8/Compose: kl_GL.UTF-8

en_US.UTF-8/Compose: kk_KZ.UTF-8

en_US.UTF-8/Compose: kn_IN.UTF-8

-en_US.UTF-8/Compose: ko_KR.UTF-8

+ko_KR.UTF-8/Compose: ko_KR.UTF-8

en_US.UTF-8/Compose: ks_IN.UTF-8

en_US.UTF-8/Compose: ks_IN@devanagari.UTF-8

en_US.UTF-8/Compose: kw_GB.UTF-8

@@ -413,7 +413,9 @@ en_US.UTF-8/Compose: vi_VN.UTF-8

en_US.UTF-8/Compose: wa_BE.UTF-8

en_US.UTF-8/Compose: yi_US.UTF-8

en_US.UTF-8/Compose: xh_ZA.UTF-8

-en_US.UTF-8/Compose: zh_TW.UTF-8

+zh_TW.UTF-8/Compose: zh_TW.UTF-8

+zh_CN.UTF-8/Compose: zh_CN.UTF-8

+zh_HK.UTF-8/Compose: zh_HK.UTF-8

en_US.UTF-8/Compose: zu_ZA.UTF-8

en_US.UTF-8/Compose: bs_BA.UTF-8

en_US.UTF-8/Compose: ne_NP.UTF-8