Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 713dc7012a fix make bulk on OpenADK buildserver 14 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu