[SCM] mplayer2/upstream: Merge branch 'upstream.experimental' into upstream

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0-541-gf64a4e9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: a64a8adb11e65d7c8437b79dc9be653b9d203715
X-Git-Newrev: cf6610f10da97c0ba7733f887bd78522daba4b53

The following commit has been merged in the upstream branch:
commit cf6610f10da97c0ba7733f887bd78522daba4b53
Merge: a64a8adb11e65d7c8437b79dc9be653b9d203715 222d764aab7bc6b5f03d52a3e325117cd53400b3
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 4 13:27:39 2012 +0200

    Merge branch 'upstream.experimental' into upstream


-- 
mplayer2 packaging