Merge proposals dependent on lp://qastaging/~stefanlsd/mplayer/dev

lp://qastaging/~stefanlsd/mplayer/dev has no merge proposals.