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)
Conflicts:
ChangeLog


Trivial merge