[SCM] libdvbpsi/master: Merge commit 'upstream/0.2.2'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 95bf727b6bdb33848c1b7ff4c7cdb0a6771acebd
X-Git-Newrev: 82ad66dec37cb6232f41aa744c788265175cbce5

The following commit has been merged in the master branch:
commit 82ad66dec37cb6232f41aa744c788265175cbce5
Merge: 95bf727b6bdb33848c1b7ff4c7cdb0a6771acebd 6e4a4a6534bc0ebd0a51d96aaf139a8d33f5472c
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 5 01:21:13 2011 +0100

    Merge commit 'upstream/0.2.2'


-- 
libdvbpsi packaging