[SCM] gmerlin-avdecoder/master: Merge commit 'upstream/1.1.0'

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

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

The following commit has been merged in the master branch:
commit 37ab92462e89ec6f7c2cd94c13b8eba9513bcafd
Merge: dc99e9fc29cbdc1e12506d268895b4b70bc58b2e f70ccc4a3409667a5b3d9cdb7a4575fcd821e601
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jan 10 11:35:00 2011 +0100

    Merge commit 'upstream/1.1.0'


-- 
gmerlin-avdecoder packaging