[SCM] gmerlin/master: Merge commit 'upstream/1.0.0'

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

Imported Upstream version 1.0.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: ccdaeb098ff15382481b15bcc68b1872d4c207fe
X-Git-Newrev: 2548108328d6807252081e3fe768f4f27a969b02

The following commit has been merged in the master branch:
commit c50be9355fbd61b44515a34fa74ffc8c4acbfcf0
Merge: ccdaeb098ff15382481b15bcc68b1872d4c207fe d7c6a88dfdfbf19c0ef8cadaec7ad1d657b94285
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jan 10 12:00:20 2011 +0100

    Merge commit 'upstream/1.0.0'


-- 
gmerlin packaging