Waldemar Brodkorb 4dc2822fa7 resolve merge conflict %!s(int64=14) %!d(string=hai) anos
..
patch-Makefile_in b803209ad0 fat commit to add support for firefox on ibm x40 via usb stick %!s(int64=14) %!d(string=hai) anos
patch-dbus_Makefile_in b803209ad0 fat commit to add support for firefox on ibm x40 via usb stick %!s(int64=14) %!d(string=hai) anos