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

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

Imported Upstream version 0.5.4+svn178
Imported Upstream version 0.6.1
Imported Upstream version 0.6.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: 984a62f476e09de65972f1e1d0a6d0a3ce5b94ce
X-Git-Newrev: 8be2c23437b737ffc75adf26447f1d3531a80b84

The following commit has been merged in the master branch:
commit 270551e43cff1f51a83f6a05b6530c86c745658f
Merge: 00679a7d8daaee48d41474c1b674a1f8f96175c2 68e85033c14ebb2f4d7d095ce9dc3b38df402aae
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Fri Jan 13 22:05:17 2012 +0100

    Merge commit 'upstream/0.5.4+svn178'


-- 
dvbcut packaging