Resolve conflicts for GNU readline 4.3p5.
ok deraadt@, otto@, pval@

Don't tell people to use FD_SETSIZE as the first argument to select().

GNU readline-4.1