Comment 25 for bug 320915

For mplayer the merges has been added to a bzr branch and a merge has been proposed. Please review:
https://code.launchpad.net/~andreas-wenning/mplayer/ubuntu/+merge/3268