Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Wed, 28 Mar 2012 17:06:05 +0000 (13:06 -0400)
committerUlrich Drepper <drepper@gmail.com>
Wed, 28 Mar 2012 17:06:05 +0000 (13:06 -0400)
commitfb289bde9a171c5f7fbcd1230018562dc0bd8ded
tree1241c18540bd856de5a57808329b64e03d490f7c
parent05f3d1f6c6ae403180259b84a5af0061a62ffb98
parent86ae07a8c9e8e26806f7b8dedf57e7b14a308c69
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog