Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 5a43da1af1 experimental midori support 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu