Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches c012f48766 hudson says again: missing patch 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu