[SCM] gecko-mediaplayer/master: Merge commit 'upstream/1.0.5'

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

Imported Upstream version 1.0.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 67d73e1ed3a43a61f9d3af49a6e01fcc97f62b23
X-Git-Newrev: e93975b0df3ffb0a30dc854d3a4dbc07da1d3974

The following commit has been merged in the master branch:
commit 038b6190a5c3d77aff7d47a6c9bec4ed37e11e47
Merge: 67d73e1ed3a43a61f9d3af49a6e01fcc97f62b23 4b93a80ae7f996016f3d2a7bf9a748640c268059
Author: Sebastian Ramacher <s.ramacher at gmx.at>
Date:   Mon Jan 2 13:29:39 2012 +0100

    Merge commit 'upstream/1.0.5'


-- 
gecko-mediaplayer packaging