Fix some strange changes made in patch 1731, according to Alexandre's comments. * doc/README.txt: here.