# HG changeset patch
# User cl
# Date 1289331900 28800
# Node ID e8d03f9ed991f06e2cc1a0db2861d6752b5159eb
# Parent  0704a538021036ecb784687ebc2efdfa5778cc81# Parent  e4ade17894f3f665951d7cd51730530d0d8d4cb6
Merge

diff -r 0704a5380210 -r e8d03f9ed991 jdk/src/share/classes/sun/text/resources/FormatData_fr.java
--- a/jdk/src/share/classes/sun/text/resources/FormatData_fr.java	Thu Nov 04 15:54:34 2010 -0700
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr.java	Tue Nov 09 11:45:00 2010 -0800
@@ -145,7 +145,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
diff -r 0704a5380210 -r e8d03f9ed991 jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java
--- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java	Thu Nov 04 15:54:34 2010 -0700
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java	Tue Nov 09 11:45:00 2010 -0800
@@ -76,7 +76,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
diff -r 0704a5380210 -r e8d03f9ed991 jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java
--- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java	Thu Nov 04 15:54:34 2010 -0700
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java	Tue Nov 09 11:45:00 2010 -0800
@@ -68,7 +68,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
diff -r 0704a5380210 -r e8d03f9ed991 jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java
--- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java	Thu Nov 04 15:54:34 2010 -0700
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java	Tue Nov 09 11:45:00 2010 -0800
@@ -83,7 +83,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
diff -r 0704a5380210 -r e8d03f9ed991 jdk/test/sun/text/resources/LocaleData
--- a/jdk/test/sun/text/resources/LocaleData	Thu Nov 04 15:54:34 2010 -0700
+++ b/jdk/test/sun/text/resources/LocaleData	Tue Nov 09 11:45:00 2010 -0800
@@ -5468,12 +5468,12 @@
 LocaleNames/fr/GY=Guyana
 
 # bug 4225362
-FormatData/fr/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ
-FormatData/fr_BE/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ
-FormatData/fr_CA/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ
-FormatData/fr_CH/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ
-FormatData/fr_FR/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ
-FormatData/fr_LU/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ
+FormatData/fr/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
+FormatData/fr_BE/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
+FormatData/fr_CA/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
+FormatData/fr_CH/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
+FormatData/fr_FR/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
+FormatData/fr_LU/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
 
 # bug 6547501
 FormatData/fr/NumberPatterns/2=#,##0 %