Merge branch 'master' of ssh://sourceware.org/git/glibc
commiteb5e79feb71e6a9bf7fcb59a5e2c56ab09a08868
authorUlrich Drepper <drepper@redhat.com>
Tue, 6 Jul 2010 14:49:58 +0000 (6 07:49 -0700)
committerUlrich Drepper <drepper@redhat.com>
Tue, 6 Jul 2010 14:49:58 +0000 (6 07:49 -0700)
treee411ac63adce3d0c37c572dad72396999eade40a
parent8a492a675e566dc1e666df0a86cbf541442cb179
parent713df3d547041fddea30fa78c52dd0615bfd4c24
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog