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