Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Thu, 8 Mar 2012 07:49:12 +0000 (02:49 -0500)
committerUlrich Drepper <drepper@gmail.com>
Thu, 8 Mar 2012 07:49:12 +0000 (02:49 -0500)
commitca2ff9fc0492c42f5407a64dd009baa0df488887
tree195a6b67174569b783ecdeda4c94a2b36f0445ce
parent70bca0a394a2135927210007f1dd6eceafe1aaf5
parent65b81130c5006b1140c3d8b59038a68004ff61c8
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog