Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 gadi atpakaļ
..
patches 424e20778f another gold user eliminated, build fixes 10 gadi atpakaļ
Makefile f14c1fc551 resolve merge conflict 10 gadi atpakaļ