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


Trivial merge