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

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

Imported Upstream version 1.0.0~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0cb72e57b51bc195ae010fffb5a855c50d0de14e
X-Git-Newrev: d908b37237f07d88eadc593725172fb7f90c3310

The following commit has been merged in the master branch:
commit 4d64bc09302afdcf67999bb667b4becbe79f30f8
Merge: 0cf846b0d2941a2042aa60eff946f5bff4b2a9ad cec9ca2d999f8ac591faa53d5246c6363936113f
Author: IOhannes m zmölnig <zmoelnig at umlaeute.mur.at>
Date:   Mon Jan 10 19:55:00 2011 +0100

    Merge commit 'upstream/1.0.0_dfsg'


-- 
gmerlin packaging