Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Thu, 7 Jul 2011 00:39:06 +0000 (20:39 -0400)
committerUlrich Drepper <drepper@gmail.com>
Thu, 7 Jul 2011 00:39:06 +0000 (20:39 -0400)

Trivial merge