Merge branch 'master' of ssh://sources.redhat.com/git/glibc
commit39be1d1f7b55b4d63a218cd0ec99393acaf1f083
authorUlrich Drepper <drepper@redhat.com>
Thu, 8 Apr 2010 22:57:39 +0000 (8 15:57 -0700)
committerUlrich Drepper <drepper@redhat.com>
Thu, 8 Apr 2010 22:57:39 +0000 (8 15:57 -0700)
tree3701af685498bbac6f0537a41f7dd2df501a4c2b
parentde240a05b3638879af2f9ab663c56ad8b26b1ad3
parentdf5efd61b01c52573bfd011b93a96966047308c6
Merge branch 'master' of ssh://sources.redhat.com/git/glibc

Conflicts:
ChangeLog
ChangeLog