Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Resolve conflicts

Merge files peter takes off the vendor branch

Fix some more files that got butchered to appear to be back on the
vendor branch again. (These will need a readline import merge too)

Merge local changes

Merge local changes

Merge conflicts

merge

Merge local changes

Merge with previous variant

Backup savestring as rl_savestring

This commit was generated by cvs2svn to compensate for changes in r21308,
which included commits to RCS files with non-trunk default branches.

Libreadline.