Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Tue, 6 Sep 2011 21:21:04 +0000 (17:21 -0400)
committerUlrich Drepper <drepper@gmail.com>
Tue, 6 Sep 2011 21:21:04 +0000 (17:21 -0400)

Trivial merge