am 313c18d6: Merge "Fix the ISO-8859-7 aliases in convrtrs.txt."

* commit '313c18d6da0caa031241834a93162b234b2cd4fc':
  Fix the ISO-8859-7 aliases in convrtrs.txt.
diff --git a/data/mappings/convrtrs.txt b/data/mappings/convrtrs.txt
index 0cfdfdf..17f262a 100644
--- a/data/mappings/convrtrs.txt
+++ b/data/mappings/convrtrs.txt
@@ -459,14 +459,15 @@
 # ISO Greek (with euro update). This is really ISO_8859-7:2003
 ibm-9005_X110-2007 { UTR22* }
                         ibm-9005 { IBM* }
-                        ISO-8859-7 { MIME* IANA WINDOWS }
-                        greek { IANA WINDOWS }
-                        greek8 { IANA WINDOWS }
-                        ELOT_928 { IANA WINDOWS }
-                        ECMA-118 { IANA WINDOWS }
-                        csISOLatinGreek { IANA WINDOWS }
-                        iso-ir-126 { IANA WINDOWS }
-                        ISO_8859-7:1987 { IANA* WINDOWS }
+                        ISO-8859-7 { MIME* IANA JAVA* WINDOWS }
+                        8859_7 { JAVA }
+                        greek { IANA JAVA WINDOWS }
+                        greek8 { IANA JAVA WINDOWS }
+                        ELOT_928 { IANA JAVA WINDOWS }
+                        ECMA-118 { IANA JAVA WINDOWS }
+                        csISOLatinGreek { IANA JAVA WINDOWS }
+                        iso-ir-126 { IANA JAVA WINDOWS }
+                        ISO_8859-7:1987 { IANA* JAVA WINDOWS }
                         windows-28597 { WINDOWS* }
                         sun_eu_greek # For Solaris
 
@@ -474,15 +475,6 @@
 # JDK 1.5 has these aliases.
 ibm-813_P100-1995 { UTR22* }
                         ibm-813 { IBM* JAVA }
-                        ISO-8859-7 { JAVA* }
-                        greek { JAVA }
-                        greek8 { JAVA }
-                        ELOT_928 { JAVA }
-                        ECMA-118 { JAVA }
-                        csISOLatinGreek { JAVA }
-                        iso-ir-126 { JAVA }
-                        ISO_8859-7:1987 { JAVA }
-                        8859_7 { JAVA }
                         cp813 { JAVA }
                         813 { JAVA }
 
diff --git a/stubdata/icudt51l-all.dat b/stubdata/icudt51l-all.dat
index 3133167..ed0e8a7 100644
--- a/stubdata/icudt51l-all.dat
+++ b/stubdata/icudt51l-all.dat
Binary files differ
diff --git a/stubdata/icudt51l-default.dat b/stubdata/icudt51l-default.dat
index a754289..ba0adfc 100644
--- a/stubdata/icudt51l-default.dat
+++ b/stubdata/icudt51l-default.dat
Binary files differ