Merge branch 'master' of /home/eggert/src/gnu/autoconf-savannah/