Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 98a6457,a96f05c..483757d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2012-03-07  Marek Polacek  <polacek@redhat.com>
 +
 +      * stdio-common/tst-long-dbl-fphex.c: Fix test for non ldbl-96 targets.
 +
+ 2012-03-08  Marek Polacek  <polacek@redhat.com>
+ 
+       [BZ #13806]
+       * stdio-common/Makefile (tests): Add tst-fphex-wide.
+       * stdio-common/tst-fphex.c: Define a few macros to make the
+       test reusable.  Use them.
+       * stdio-common/tst-fphex-wide.c: New file.
+ 
  2012-03-08  Joseph Myers  <joseph@codesourcery.com>
  
        [BZ #6911]