Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Fri, 27 May 2011 12:37:18 +0000 (08:37 -0400)
committerUlrich Drepper <drepper@gmail.com>
Fri, 27 May 2011 12:37:18 +0000 (08:37 -0400)
commitfdc2fefe46db79f0a19f690531cd775fbbc2740f
tree0a5761e16b7e1685e72c09862390fb96c17fd702
parente57420c6c67b914abb01f7c3b1d999795121ce70
parentea486f691d34ef2a28d06bb507ac3352e32e1f13
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
NEWS
ChangeLog
NEWS