Merge branch 'master' of ssh://sourceware.org/git/glibc
commitf6ce0f974b727437e383f69d17d51962c86bf31b
authorUlrich Drepper <drepper@gmail.com>
Thu, 10 Mar 2011 17:53:39 +0000 (10 12:53 -0500)
committerUlrich Drepper <drepper@gmail.com>
Thu, 10 Mar 2011 17:53:39 +0000 (10 12:53 -0500)
tree6a873092f25db555177458a8884c057a1217cf9f
parent028478fa40d85a73b19638dbe3f83b1acebf370c
parent03592fc7ea512141f4c6f5f5f636d3b856563763
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog