Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Mon, 22 Aug 2011 20:10:16 +0000 (16:10 -0400)
committerUlrich Drepper <drepper@gmail.com>
Mon, 22 Aug 2011 20:10:16 +0000 (16:10 -0400)
commit304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a
treef2697c0731253059c56256775460abd4ce7b1167
parente888bcbe4fb8ad538ec640bfb18b687d51e001e7
parent70538b7fe6c9a23fb942b10a9e6da4c138557e3c
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog
elf/dl-deps.c