[SCM] mplayer/master.experimental: Merge commit 'upstream/1.0_rc4+svn34492' into master.experimental

[ricotz-guest at users.alioth.debian.org]

Imported Upstream version 1.0~rc4+svn34492
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: 357b49480d4fdc8695cbf6a1ea49804c34bec494
X-Git-Newrev: 68bf155d6ea972e72b884f1153281d810a3abc0f

The following commit has been merged in the master.experimental branch:
commit a9de5cae5f06a40af04de7d33d5089c80b3c4d6b
Merge: 357b49480d4fdc8695cbf6a1ea49804c34bec494 0008965937e505c2e5e1cdda7fedde4286267f7e
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Tue Jan 3 19:26:13 2012 +0100

    Merge commit 'upstream/1.0_rc4+svn34492' into master.experimental


-- 
mplayer packaging