Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Fri, 3 Jun 2011 11:02:32 +0000 (07:02 -0400)
committerUlrich Drepper <drepper@gmail.com>
Fri, 3 Jun 2011 11:02:32 +0000 (07:02 -0400)
commit06c07b8b9fd21854c90d22b5b23196d78837262a
tree1d6adec4505ce0935fc5663c950e2774c163dc73
parent3d29045b5e8329d97693eda8d98f1d1e60b99c8f
parent8c29731192565b9c917d6b97db78dcd302283df8
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog