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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0-542-gbb90802
Merge branch 'upstream.experimental' into upstream
Merge tag 'upstream/2.0-518-gb711624' into upstream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4fe5ef89ced5bbe71525d702000a9a72b5c81d4a
X-Git-Newrev: 462ebb1fc17f7e607d4fd2485df040000f9ff4f3

The following commit has been merged in the master branch:
commit f9226af3aa52bec32ff31cabe0086ab4b86d9a93
Merge: 4fe5ef89ced5bbe71525d702000a9a72b5c81d4a 1771720d19722a6eb44ff084267a43f4c5f928d8
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 4 13:32:04 2012 +0200

    Merge commit 'upstream/2.0-542-gbb90802'


-- 
mplayer2 packaging