Merge branch 'master' of ssh://sourceware.org/git/glibc-ports
authorRichard Henderson <rth@twiddle.net>
Fri, 18 May 2012 18:48:15 +0000 (11:48 -0700)
committerRichard Henderson <rth@twiddle.net>
Fri, 18 May 2012 18:48:15 +0000 (11:48 -0700)

Trivial merge