Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Wed, 25 Jan 2012 00:29:39 +0000 (19:29 -0500)
committerUlrich Drepper <drepper@gmail.com>
Wed, 25 Jan 2012 00:29:39 +0000 (19:29 -0500)
commit83cf1b9f0244a6c6b420de88f19d707f2c2e5247
tree678d9d6012dfd124a23b01266adeaca815e6634c
parentb15549e6f8d5936c4312b022ac8910823f2c2280
parenta037381ff8223ef35e225152802bf0cbf4612103
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog