[SCM] mplayer/master: Merge commit 'upstream/1.0_rc4.dfsg1+svn34540'

[siretart at users.alioth.debian.org]

Imported Upstream version 1.0~rc4.dfsg1+svn34540
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 306c1ffafe72044dd4ee6f71674e6d3f02ff0a16
X-Git-Newrev: 1bbd44dc8addb0edd7e405673c80690c9de11ac6

The following commit has been merged in the master branch:
commit a854e5980d83ca68c88e9f217687aad507f5b0e4
Merge: 34afc3dd622cff3c5955375df95016dd9fdb518b e375cbd23c9280c8232f3323c09a3268120f934a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jan 12 22:22:50 2012 +0100

    Merge commit 'upstream/1.0_rc4.dfsg1+svn34540'


-- 
mplayer packaging