Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 631751dc9f fix ruby compile, update to latest 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu