Merge branch 'master' of ssh://sources.redhat.com/git/glibc
commitbf3fde08c6dfc45497d0f48aec4299d0ecb56b4c
authorUlrich Drepper <drepper@redhat.com>
Sat, 16 May 2009 02:50:06 +0000 (15 19:50 -0700)
committerUlrich Drepper <drepper@redhat.com>
Sat, 16 May 2009 02:50:06 +0000 (15 19:50 -0700)
treef989cf7072165cbc2b193223422d2b5cd178b05d
parent9a1fbe861d8ae41976f926a211d59098a030878f
parent69710097952cf6c86219093d81b4ffbb7c4e10d5
Merge branch 'master' of ssh://sources.redhat.com/git/glibc

Conflicts:
ChangeLog