automerge master into master-experimental
Merge branch 'master-experimental' of https://github.com/netzbasis/openbsd-unofficial into master-experimental
update from anoncvs
update from anoncvs
automerge master into master-experimental
Merge branch 'master-experimental' into libedit