From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 29 Sep 2009 13:13:11 +0000 (-0700)
Subject: Merge branch 'master' of ssh://sources.redhat.com/git/glibc
X-Git-Tag: fedora/glibc-2.10.90-25~2^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8d7c1eaddec2ab245dd4920107e273114a9b0e8;p=thirdparty%2Fglibc.git

Merge branch 'master' of ssh://sources.redhat.com/git/glibc

Conflicts:
	ChangeLog
---

f8d7c1eaddec2ab245dd4920107e273114a9b0e8
diff --cc ChangeLog
index 6876b83ea72,0e0fa20f2b2..be2f01a9412
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
 +2009-09-28  Andreas Schwab  <schwab@redhat.com>
 +
 +	* stdio-common/printf_fp.c: Check for and avoid integer overflows.
 +	* stdio-common/vfprintf.c: Likewise.
 +
+ 2009-09-27  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+ 
+ 	* sysdeps/mach/hurd/mkdirat.c: Include <hurd/fd.h>.
 -        (mkdirat): Call __directory_name_split_at instead of
 -        __directory_name_split.
++	(mkdirat): Call __directory_name_split_at instead of
++	__directory_name_split.
+ 
  2009-09-28  Ulrich Drepper  <drepper@redhat.com>
  
  	* locale/programs/locale-spec.c (locale_special): If nothing matches