Merge branch 'master' of ssh://sources.redhat.com/git/glibc
authorUlrich Drepper <drepper@redhat.com>
Tue, 29 Sep 2009 13:13:11 +0000 (06:13 -0700)
committerUlrich Drepper <drepper@redhat.com>
Tue, 29 Sep 2009 13:13:11 +0000 (06:13 -0700)
commitf8d7c1eaddec2ab245dd4920107e273114a9b0e8
tree8bf19868f1d5dab641605b3e7a1a1adab3314355
parent199eb0de8d673fb23aa127721054b4f1803d61f3
parentff2835318177dd4600d3aa03626f4b5748e3fbeb
Merge branch 'master' of ssh://sources.redhat.com/git/glibc

Conflicts:
ChangeLog
ChangeLog