[BZ #6040]

	* locales/fr_FR: Fix abmon, abday, d_ftm, grouping.

3 files changed, 47 insertions, 25 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index dd11e6ad4d..c87dca723a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-07  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #6040]
+	* locales/fr_FR: Fix abmon, abday, d_ftm, grouping.
+
 	[BZ #6004]
 	* locales/iso14651_t1_common: Fix first weight for U+1E60, U+1E62,
 	U+1E64, U+1E66, and U+1E68.
diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index 8bae005657..92c3bde1b7 100644
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -3,33 +3,35 @@ escape_char  /
 %
 % French Language Locale for France
 % Source: RAP
-% Address: Sankt Jo//rgens Alle 8
-%    DK-1615 Ko//benhavn V, Danmark
-% Contact: Keld Simonsen
-% Email: Keld.Simonsen@dkuug.dk
-% Tel: +45 - 31226543
-% Fax: +45 - 33256543
 % Language: fr
+% Contact: Traduc.org
+% Address: 18, rue Cavendish
+%          75019 Paris
+% Email: traduc@traduc.org
 % Territory: FR
-% Revision: 4.3
-% Date: 1996-10-15
+% Revision: 4.4
+% Date: 2008-03-02
 % Users: general
 % Charset: ISO-8859-1
+% Authors:
+% 2000-06-28, keld.simonsen@dkuug.dk
+% 2008-03-02, stephane.raimbault@gmail.com
+%
 % Distribution and use is free, also
 % for commercial purposes.
 
 LC_IDENTIFICATION
 title      "French locale for France"
 source     "RAP"
-address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
-contact    "Keld Simonsen"
+address    ""
+contact    "Traduc.org"
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "French"
 territory  "France"
 revision   "1.0"
-date       "2000-06-28"
+date       "2008-03-15"
 %
 category  "fr_FR:2000";LC_IDENTIFICATION
 category  "fr_FR:2000";LC_CTYPE
@@ -72,7 +74,7 @@ int_curr_symbol           "<U0045><U0055><U0052><U0020>"
 currency_symbol           "<U20AC>"
 mon_decimal_point         "<U002C>"
 mon_thousands_sep         "<U0020>"
-mon_grouping              3;3
+mon_grouping              3
 positive_sign             ""
 negative_sign             "<U002D>"
 int_frac_digits           2
@@ -88,14 +90,17 @@ END LC_MONETARY
 LC_NUMERIC
 decimal_point             "<U002C>"
 thousands_sep             "<U0020>"
-grouping                  0;0
+grouping                  3
 END LC_NUMERIC
 
 LC_TIME
-abday   "<U0064><U0069><U006D>";"<U006C><U0075><U006E>";/
-        "<U006D><U0061><U0072>";"<U006D><U0065><U0072>";/
-        "<U006A><U0065><U0075>";"<U0076><U0065><U006E>";/
-        "<U0073><U0061><U006D>"
+abday   "<U0064><U0069><U006D><U002E>";/
+        "<U006C><U0075><U006E><U002E>";/
+        "<U006D><U0061><U0072><U002E>";/
+        "<U006D><U0065><U0072><U002E>";/
+        "<U006A><U0065><U0075><U002E>";/
+        "<U0076><U0065><U006E><U002E>";/
+        "<U0073><U0061><U006D><U002E>"
 day     "<U0064><U0069><U006D><U0061><U006E><U0063><U0068><U0065>";/
         "<U006C><U0075><U006E><U0064><U0069>";/
         "<U006D><U0061><U0072><U0064><U0069>";/
@@ -103,12 +108,18 @@ day     "<U0064><U0069><U006D><U0061><U006E><U0063><U0068><U0065>";/
         "<U006A><U0065><U0075><U0064><U0069>";/
         "<U0076><U0065><U006E><U0064><U0072><U0065><U0064><U0069>";/
         "<U0073><U0061><U006D><U0065><U0064><U0069>"
-abmon   "<U006A><U0061><U006E>";"<U0066><U00E9><U0076>";/
-        "<U006D><U0061><U0072>";"<U0061><U0076><U0072>";/
-        "<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/
-        "<U006A><U0075><U0069>";"<U0061><U006F><U00FB>";/
-        "<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/
-        "<U006E><U006F><U0076>";"<U0064><U00E9><U0063>"
+abmon   "<U006A><U0061><U006E><U0076><U002E>";/
+        "<U0066><U00E9><U0076><U0072><U002E>";/
+        "<U006D><U0061><U0072><U0073>";/
+        "<U0061><U0076><U0072><U0069><U006C>";/
+        "<U006D><U0061><U0069>";/
+        "<U006A><U0075><U0069><U006E>";/
+        "<U006A><U0075><U0069><U006C><U002E>";/
+        "<U0061><U006F><U00FB><U0074>";/
+        "<U0073><U0065><U0070><U0074><U002E>";/
+        "<U006F><U0063><U0074><U002E>";/
+        "<U006E><U006F><U0076><U002E>";/
+        "<U0064><U00E9><U0063><U002E>"
 mon     "<U006A><U0061><U006E><U0076><U0069><U0065><U0072>";/
         "<U0066><U00E9><U0076><U0072><U0069><U0065><U0072>";/
         "<U006D><U0061><U0072><U0073>";/
@@ -122,7 +133,7 @@ mon     "<U006A><U0061><U006E><U0076><U0069><U0065><U0072>";/
         "<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U0065>";/
         "<U0064><U00E9><U0063><U0065><U006D><U0062><U0072><U0065>"
 d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
-d_fmt   "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
+d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
diff --git a/sysdeps/unix/sysv/linux/net/ethernet.h b/sysdeps/unix/sysv/linux/net/ethernet.h
index 7ca8e8348e..0242d5899e 100644
--- a/sysdeps/unix/sysv/linux/net/ethernet.h
+++ b/sysdeps/unix/sysv/linux/net/ethernet.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2001, 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
@@ -45,9 +45,17 @@ struct ether_header
 
 /* Ethernet protocol ID's */
 #define	ETHERTYPE_PUP		0x0200          /* Xerox PUP */
+#define ETHERTYPE_SPRITE	0x0500		/* Sprite */
 #define	ETHERTYPE_IP		0x0800		/* IP */
 #define	ETHERTYPE_ARP		0x0806		/* Address resolution */
 #define	ETHERTYPE_REVARP	0x8035		/* Reverse ARP */
+#define ETHERTYPE_AT		0x809B		/* AppleTalk protocol */
+#define ETHERTYPE_AARP		0x80F3		/* AppleTalk ARP */
+#define	ETHERTYPE_VLAN		0x8100		/* IEEE 802.1Q VLAN tagging */
+#define ETHERTYPE_IPX		0x8137		/* IPX */
+#define	ETHERTYPE_IPV6		0x86dd		/* IP protocol version 6 */
+#define ETHERTYPE_LOOPBACK	0x9000		/* used to test interfaces */
+
 
 #define	ETHER_ADDR_LEN	ETH_ALEN                 /* size of ethernet addr */
 #define	ETHER_TYPE_LEN	2                        /* bytes in type field */