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

[siretart at users.alioth.debian.org]

Imported Upstream version 2.0-54-gd33877a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c92e13d58c31d3d6182068e63a3234352f4595c1
X-Git-Newrev: 0665cc47bfa033317ee7b2b5b4b0971d4e7cc22f

The following commit has been merged in the master branch:
commit 7682190a01468a21f596358671c6715303755627
Merge: 1f37bf74fae73ddb600b781361eb8a102bb25fda cc18edeacf4bc5ecadf05354ec15f3366e1bc2de
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Apr 21 09:17:54 2011 +0200

    Merge commit 'upstream/2.0-54-gd33877a'


-- 
mplayer2 packaging