[SCM] libdvbpsi/master: Merge branch 'upstream'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.1.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 07b02d1f9c96f13797bc1f0235950013bfa7e69d
X-Git-Newrev: 5cbb95884cde2cca0c9aa68b6c413149786d18a1

The following commit has been merged in the master branch:
commit ff04bb132ca3b27a096935d3863a97fe6107f183
Merge: 07b02d1f9c96f13797bc1f0235950013bfa7e69d a4215ce484ea4379eaabc42b7611b7afde5cc31e
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 13 15:53:57 2011 +0200

    Merge branch 'upstream'


-- 
libdvbpsi packaging