Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Sat, 20 Aug 2011 19:17:30 +0000 (15:17 -0400)
committerUlrich Drepper <drepper@gmail.com>
Sat, 20 Aug 2011 19:17:30 +0000 (15:17 -0400)

Trivial merge