Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Sat, 2 Apr 2011 19:28:16 +0000 (15:28 -0400)
committerUlrich Drepper <drepper@gmail.com>
Sat, 2 Apr 2011 19:28:16 +0000 (15:28 -0400)
commit955ce8cf2d884b3419c058de562174046daad95b
tree235310d163537723a4606945de5a84030d4f7246
parent94521213b6b157037944693f56dec159da0084bc
parent81489b2ec3e21ae4fae5ff10fe578388d4d8a982
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog