Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Thu, 22 Dec 2011 19:23:28 +0000 (14:23 -0500)
committerUlrich Drepper <drepper@gmail.com>
Thu, 22 Dec 2011 19:23:28 +0000 (14:23 -0500)
commit2797beae36e8869459b80c51f216cb4558675dad
treef972fb95ae89872d0ef11869d8f9fe26a65e2a52
parent2bd779ae3f3a86bce22fcb7665d740b14ac677ca
parent154bfc16225aaa3d3104e758eed2a17297131599
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog