[SCM] schism/master: Merge commit 'upstream/0+20110101'

[alessio at users.alioth.debian.org]

Imported Upstream version 0+20110101
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3678e13a3d9e9a4be438769a843472a53b256dd7
X-Git-Newrev: ed5a9db518ef47f5e8354a08e6579e40e8351778

The following commit has been merged in the master branch:
commit ed5a9db518ef47f5e8354a08e6579e40e8351778
Merge: 3678e13a3d9e9a4be438769a843472a53b256dd7 87f5da103dc9df149f582f0c0c6487b729517bf4
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Feb 18 15:11:17 2011 +0100

    Merge commit 'upstream/0+20110101'


-- 
schism packaging