[SCM] mplayer2/master: Merge commit 'upstream/2.0'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 470bf2070d568f68ab62044c213586686f65c89f
X-Git-Newrev: 0915cfdaedf17064228b5ae775ec58dc80a97828

The following commit has been merged in the master branch:
commit 82b80fb4843e2d5544ab3449a95c270be117b498
Merge: 73fb22e10b29f9153121ae9d8c039e24002c8a50 f9e78669cb189a02e0402e5a6828b6dae04de7b0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Apr 18 18:32:07 2011 +0200

    Merge commit 'upstream/2.0'


-- 
mplayer2 packaging