Merge changes between r19292 and r19350 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@19351 7b3dc134-2b1b-0410-93df-9e9f96275f8d

2 files changed, 26 insertions, 15 deletions

diff --git a/libc/ChangeLog b/libc/ChangeLog
index 9508ade96..e59ed6c9d 100644
--- a/libc/ChangeLog
+++ b/libc/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-28  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* manual/contrib.texi (Contributors): Sort alphabetically by last name.
+
+2012-06-27  Andreas Jaeger  <aj@suse.de>
+
+	* manual/contrib.texi (Contributors): Add Samuel Thibault.
+
 2012-06-25  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/s390/fpu/libm-test-ulps: Update.
diff --git a/libc/manual/contrib.texi b/libc/manual/contrib.texi
index 1445c7823..e28e2f251 100644
--- a/libc/manual/contrib.texi
+++ b/libc/manual/contrib.texi
@@ -236,17 +236,34 @@ Marek Polacek for various fixes.
 Siddhesh Poyarekar for various fixes.
 
 @item
+Tom Quinn for contributing the startup code to support SunOS shared
+libraries and the port to SGI machines running Irix 4
+(@code{mips-sgi-irix4}).
+
+@item
 Pravin Satpute for writing sorting rules for some Indian languages.
 
 @item
+Douglas C. Schmidt for writing the quick sort function used as a
+fallback by @code{qsort}.
+
+@item
 Will Schmidt for optimized string functions on PowerPC.
 
 @item
+Andreas Schwab for the port to Linux/m68k
+(@code{m68k-@var{anything}-linux}) and for his direction as part of
+@theglibc{} steering committee.
+
+@item
 Martin Schwidefsky for porting to Linux on s390
 (@code{s390-@var{anything}-linux}) and s390x
 (@code{s390x-@var{anything}-linux}).
 
 @item
+Thomas Schwinge for his contribution to Hurd and the SH architecture.
+
+@item
 Carlos Eduardo Seo for optimized functions on PowerPC.
 
 @item
@@ -259,18 +276,6 @@ Jes Sorensen for porting to Linux on IA64 (@code{ia64-@var{anything}-linux}).
 Richard Stallman for his contribution to the @code{getopt} function.
 
 @item
-Douglas C. Schmidt for writing the quick sort function used as a
-fallback by @code{qsort}.
-
-@item
-Andreas Schwab for the port to Linux/m68k
-(@code{m68k-@var{anything}-linux}) and for his direction as part of
-@theglibc{} steering committee.
-
-@item
-Thomas Schwinge for his contribution to Hurd and the SH architecture.
-
-@item
 Alfred M. Szmidt for various fixes.
 
 @item
@@ -278,9 +283,7 @@ Ian Lance Taylor for contributing the port to the MIPS DECStation
 running Ultrix 4 (@code{mips-dec-ultrix4}).
 
 @item
-Tom Quinn for contributing the startup code to support SunOS shared
-libraries and the port to SGI machines running Irix 4
-(@code{mips-sgi-irix4}).
+Samuel Thibault for improving the Hurd port.
 
 @item
 Tim Waugh for the implementation of the POSIX.2 @code{wordexp}