Merge branch 'master' of git://sourceware.org/git/glibc