Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Thu, 9 Jun 2011 11:03:25 +0000 (07:03 -0400)
committerUlrich Drepper <drepper@gmail.com>
Thu, 9 Jun 2011 11:03:25 +0000 (07:03 -0400)
commit8621fc3b996a7bf5d60a0fb86cb15a078dcbf542
tree4562f9f46110fae25edad559c80cc1bfd47abce5
parente80fab373c5cf01246e6acd302795b13dc50d175
parent9b849836f534bbd250a6733ebc1edf32e5f4d5dc
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog