Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 1b27dff7d2 another round of openjdk7 build fixes 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu