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

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

Imported Upstream version 1.1.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: 4903cf6242ebc4c7ac1478383df8c027a44a09d0
X-Git-Newrev: bb8f64b0adfbddd83e4c1603d139d831360c1054

The following commit has been merged in the master branch:
commit bb8f64b0adfbddd83e4c1603d139d831360c1054
Merge: 4903cf6242ebc4c7ac1478383df8c027a44a09d0 6fa05b5f52009023a02bcaf49e7358774ca63951
Author: IOhannes m zmölnig <zmoelnig at umlaeute.mur.at>
Date:   Mon Jan 10 20:13:50 2011 +0100

    Merge commit 'upstream/1.1.0_dfsg'


-- 
gmerlin-avdecoder packaging