Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches e68aff9830 fix uclibc compile 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu