# HG changeset patch
# User yhuang
# Date 1369126213 25200
# Node ID 628f27618a6a99d45e8189152c63c3e726eae7a4
# Parent  f9b8c54b68b765686cfbdfc7bebbf7095552520e# Parent  cdd64917d8e6a1e2c0211003d674e46ed48aa9fc
Merge

diff -r cdd64917d8e6 -r 628f27618a6a jdk/src/share/classes/sun/text/resources/mt/FormatData_mt.java
--- a/jdk/src/share/classes/sun/text/resources/mt/FormatData_mt.java	Tue May 21 08:53:51 2013 +0100
+++ b/jdk/src/share/classes/sun/text/resources/mt/FormatData_mt.java	Tue May 21 01:50:13 2013 -0700
@@ -54,7 +54,7 @@
                     "Mejju",
                     "\u0120unju",
                     "Lulju",
-                    "Awissu",
+                    "Awwissu",
                     "Settembru",
                     "Ottubru",
                     "Novembru",
@@ -71,7 +71,7 @@
                     "Mej",
                     "\u0120un",
                     "Lul",
-                    "Awi",
+                    "Aww",
                     "Set",
                     "Ott",
                     "Nov",
diff -r cdd64917d8e6 -r 628f27618a6a jdk/test/sun/text/resources/LocaleData
--- a/jdk/test/sun/text/resources/LocaleData	Tue May 21 08:53:51 2013 +0100
+++ b/jdk/test/sun/text/resources/LocaleData	Tue May 21 01:50:13 2013 -0700
@@ -7663,3 +7663,7 @@
 
 # bug 7114053
 LocaleNames/sq/sq=shqip
+
+# bug 7074882
+FormatData/mt/MonthNames/7=Awwissu
+FormatData/mt/MonthAbbreviations/7=Aww
diff -r cdd64917d8e6 -r 628f27618a6a jdk/test/sun/text/resources/LocaleDataTest.java
--- a/jdk/test/sun/text/resources/LocaleDataTest.java	Tue May 21 08:53:51 2013 +0100
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java	Tue May 21 01:50:13 2013 -0700
@@ -35,7 +35,7 @@
  *      6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
  *      6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
  *      7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
- *      7114053
+ *      7114053 7074882
  * @summary Verify locale data
  *
  */