Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Thu, 8 Sep 2011 01:52:39 +0000 (21:52 -0400)
committerUlrich Drepper <drepper@gmail.com>
Thu, 8 Sep 2011 01:52:39 +0000 (21:52 -0400)
commita450513e1d51cb8fe46ba5ebd92399247060b980
tree841c1c71f8a899f67c9d8e14cde9a85ffb9f6c16
parent08a300c956feeca7ccb9081f88701229da8e25c5
parent59178ef977d3c8392eff263d40a16d7c741edca4
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog