[SCM] mplayer2/master: Merge tag 'upstream/2.0-554-gf63dbad'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0-554-gf63dbad
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b433abc570a1258ec03a4b87d8121da4382cf2ca
X-Git-Newrev: 3bd5d54777679803cf4407e71ac3a0e2829dc50d

The following commit has been merged in the master branch:
commit 4c501714212b812679b544c8668ba74d7cf4cb1d
Merge: b433abc570a1258ec03a4b87d8121da4382cf2ca 6b580eba06576ac9fee6cf866b15866e3b6ce514
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat May 19 20:00:01 2012 +0200

    Merge tag 'upstream/2.0-554-gf63dbad'
    
    Upstream version 2.0-554-gf63dbad


-- 
mplayer2 packaging