Merge branch 'master' of csclub.uwaterloo.ca:/users/kopensolaris-gnu/git/glibc