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

[siretart at users.alioth.debian.org]

Imported Upstream version 2.0-426-gc32b3ed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5aa8e13dfad8d34249948be431fe7b47bc60f0aa
X-Git-Newrev: 987d6de945c50990415d94a3c6bd0e444a72287b

The following commit has been merged in the master branch:
commit 928e1c7c9c5bfae71c4e828576a9ce0bfc909c1a
Merge: 5aa8e13dfad8d34249948be431fe7b47bc60f0aa 9faf7a2505e9ee7d7a8790f2aff5a543693b045d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jan 5 17:51:30 2012 +0100

    Merge commit 'upstream/2.0-426-gc32b3ed'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/rules


-- 
mplayer2 packaging