Waldemar Brodkorb 5861b2783c fix conflict 13 gadi atpakaļ
..
Makefile 5861b2783c fix conflict 13 gadi atpakaļ