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

[alessio 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: 0915cfdaedf17064228b5ae775ec58dc80a97828
X-Git-Newrev: c92e13d58c31d3d6182068e63a3234352f4595c1

The following commit has been merged in the master branch:
commit c92e13d58c31d3d6182068e63a3234352f4595c1
Merge: 0915cfdaedf17064228b5ae775ec58dc80a97828 9e66c6d6b223285498a09b4e4109b370f1c8c777
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 19 10:53:15 2011 +0200

    Merge commit 'upstream/2.0'


-- 
mplayer2 packaging