Waldemar Brodkorb 9c0dc2abe0 fix stupid merge errors, mentioned by phil пре 16 година
..
Makefile 9c0dc2abe0 fix stupid merge errors, mentioned by phil пре 16 година