big coding oops :-/
Merge git.sv.gnu.org:/srv/git/liberty-eiffel