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

fix description so it is aligned with other entries surrounding it
--
Ok'd by millert@

GNU readline-4.1