From: Ulrich Drepper <drepper@gmail.com>
Date: Wed, 7 Mar 2012 08:32:29 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.16-tps~864
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a14d08425029c54d0d9dd7545099b01e7175ab1b;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

a14d08425029c54d0d9dd7545099b01e7175ab1b