[SCM] gnome-mplayer/master: Merge tag 'upstream/1.0.6'

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

Imported Upstream version 1.0.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 95473a4e883fa07da3f0edcef8483f110d8ea46c
X-Git-Newrev: 52e34f4e84284671a1170452cce3f0ba72579291

The following commit has been merged in the master branch:
commit 48a0d021796f30293bdb78ccbc554f8c3a8e13c6
Merge: 95473a4e883fa07da3f0edcef8483f110d8ea46c 609ed996b65eee539ecdb8bf8682e1154d4c8878
Author: Sebastian Ramacher <s.ramacher at gmx.at>
Date:   Sun Apr 29 18:06:36 2012 +0200

    Merge tag 'upstream/1.0.6'
    
    Upstream version 1.0.6


-- 
gnome-mplayer packaging