Merge branch 'master' of ssh://sourceware.org/git/glibc
commite9b25bd9303436af1de65afea4e984b640b2c81d
authorUlrich Drepper <drepper@gmail.com>
Sat, 15 Oct 2011 20:28:27 +0000 (15 16:28 -0400)
committerUlrich Drepper <drepper@gmail.com>
Sat, 15 Oct 2011 20:28:27 +0000 (15 16:28 -0400)
tree066e112c2c11bab5f3fa1ff42ba70b71fa678537
parentfd5bdc0924e0cfd1688b632068c1b26f3b0c88da
parentb468825a053aed4db613f06ea88f94008bbf3472
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog