Merge changes between r23097 and r23217 from /fsf/trunk.


git-svn-id: http://www.eglibc.org/svn/trunk/libc@23218 7b3dc134-2b1b-0410-93df-9e9f96275f8d