Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches f1a694baf2 fix mplayer for x86 build 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu