Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Wed, 7 Mar 2012 08:32:29 +0000 (03:32 -0500)
committerUlrich Drepper <drepper@gmail.com>
Wed, 7 Mar 2012 08:32:29 +0000 (03:32 -0500)
commita14d08425029c54d0d9dd7545099b01e7175ab1b
treedd860b36d6e92d8a97af073bb8839bb9fad5f0df
parent959e12e37b7fd3090fbe58913e29fa91dcc5620d
parent54ab212ca092521af1d5c4c4fc3f4200016494b5
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog