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

[alessio at users.alioth.debian.org]

Imported Upstream version 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: 74574a2e9f797b20f95443fe9344b84af0b27fb3
X-Git-Newrev: 036895da86efb1719effdfaeec7432a0cc5e2868

The following commit has been merged in the master branch:
commit 036895da86efb1719effdfaeec7432a0cc5e2868
Merge: 74574a2e9f797b20f95443fe9344b84af0b27fb3 6b926d03a2f4c1cba004473e3963f4c470e88033
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Feb 18 13:32:59 2011 +0100

    Merge commit 'upstream/20110101'


-- 
schism packaging