[SCM] zita-at1/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: 2671d1776282b2b67c896728147be167efea0194
X-Git-Newrev: 9b5d98a6295d552d3987d7b8ce6624283f919106

The following commit has been merged in the master branch:
commit 9b5d98a6295d552d3987d7b8ce6624283f919106
Merge: 2671d1776282b2b67c896728147be167efea0194 8127ea3c3fa8b2f6e7348da52353ed92882aa797
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jan 2 09:42:52 2011 +0100

    Merge commit 'upstream/0.2.1'


-- 
zita-at1 packaging