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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 1a1c4969b79d37fa6c5adfa7175a27a1d4e7b899
Merge: 04977c96e2f7536db81f27385f83fbe67bb1b2c6 1dd0c4ed41913b0b59fe77a7f2dde53e212d2d4f
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Sep 4 10:58:36 2011 +0200

    Merge commit 'upstream/0.2.1'


-- 
libdvbpsi packaging