[SCM] zita-rev1/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: f6b5f5e1c67654dc00333c61b07f6d5e60dd69d1
X-Git-Newrev: 7282cacd16654fd303aff2f9423f1ecd2e8b2255

The following commit has been merged in the master branch:
commit 7282cacd16654fd303aff2f9423f1ecd2e8b2255
Merge: c04e7cc3b28daa9788a144761bd0c8b673ffe481 87a67137c871a301bf079c423cff92a41447d84b
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 17 11:27:10 2011 +0200

    Merge commit 'upstream/0.2.1'


-- 
zita-rev1 packaging