Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
files 811342f7eb port qingy and it's dependencies DirectFB and libXScrnSaver %!s(int64=14) %!d(string=hai) anos
patches 8a9ac05d74 fix build, with a patch from sabotage %!s(int64=11) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos