Merge branch 'master' of /users/git/dtbartle/glibc-opensolaris