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

Proper @ignore usage, to prevent yet another gnu notice to pop up by mistake
in the middle of a page.
ok millert@ krw@

spelling

GNU readline-4.1