[SCM] dssi/master: Merge commit 'upstream/1.1.0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 06b5c40fd06cd3101908e34c7fce868ed42cb3e8
X-Git-Newrev: a81a096e3b20914da4f1d020ad40f3cf25e00e97

The following commit has been merged in the master branch:
commit 04b0f00ca2ac72ae29f89d5ba029927bc69d24da
Merge: 06b5c40fd06cd3101908e34c7fce868ed42cb3e8 19861cb4973cd423c22e3d4a51762e53b62e31f2
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Oct 16 13:11:54 2010 +0200

    Merge commit 'upstream/1.1.0'


-- 
dssi packaging