Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Fri, 27 Jan 2012 16:25:41 +0000 (11:25 -0500)
committerUlrich Drepper <drepper@gmail.com>
Fri, 27 Jan 2012 16:25:41 +0000 (11:25 -0500)

Trivial merge