[SCM] dvbcut/master: Merge commit 'upstream/0.5.4+svn170'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.5.4+svn170
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e19ef1ed74d54c8d05172366dfa926ec55cb14ca
X-Git-Newrev: 0682f386fb16033a6c958d558eece0536fffe847

The following commit has been merged in the master branch:
commit 04c18928912594a92b6cf32de4ac7b377415752a
Merge: e19ef1ed74d54c8d05172366dfa926ec55cb14ca 38f629c5117f8f132397989460bd80c73850d78b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 7 08:28:18 2011 +0200

    Merge commit 'upstream/0.5.4+svn170'
    
    Conflicts:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/menu
    	debian/rules


-- 
dvbcut packaging