[SCM] mplayer/master.experimental: Merge commit 'upstream/1.0.rc4.try2.dfsg1' into master.experimental

[siretart at users.alioth.debian.org]

Imported Upstream version 1.0~rc4~try2.dfsg1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.experimental
X-Git-Reftype: branch
X-Git-Oldrev: 1f04bbc5ad21917339f55eb52b6dd4ea20473ec8
X-Git-Newrev: 7c4458c85458678eb415522e7563e5bf8632fb7b

The following commit has been merged in the master.experimental branch:
commit 580fb5c81249d6e050fe16fe1f8f46cc73480440
Merge: ce5af9277635cd53e42aa53cd4065e555545e471 dad5bf077402161fb211d71649ec583af7ce64b1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 22:17:14 2011 +0100

    Merge commit 'upstream/1.0.rc4.try2.dfsg1' into master.experimental


-- 
mplayer packaging