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