[SCM] mplayer/master: Merge remote-tracking branch 'origin/master'

[siretart at users.alioth.debian.org]

Adjust versioning of mplayer listed in the mplayer-dbg's Depends field.
Properly set Replaces/Conflicts on mplayer2{,-dbg} to avoid file overwrite errors.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b13e5cdd72e22b336edc1ff7204c256e90a54f05
X-Git-Newrev: a3958391cd1b7c094dd5e29e77235a514cd5ee99

The following commit has been merged in the master branch:
commit c7025fccf78e83443573d81f4f4f02095878c6b1
Merge: 976493d96c9d51daaadb5c1e2eca0ac255649fb3 b13e5cdd72e22b336edc1ff7204c256e90a54f05
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Oct 29 10:18:16 2011 +0200

    Merge remote-tracking branch 'origin/master'


-- 
mplayer packaging