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

[alessio at users.alioth.debian.org]

Imported Upstream version 0+20100202
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 46fce1fe8c40409b4f9e45d37db243710a8c9b71
X-Git-Newrev: 4dbb3f8659c3eed48481f9f03834fc108f582957

The following commit has been merged in the master branch:
commit 2ce4032c9b3f5a6c681539558735ecbf205df14c
Merge: 46fce1fe8c40409b4f9e45d37db243710a8c9b71 39ed67cf7504520a0968c8c01b8d91c4cc4b0f0b
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Sep 5 20:05:52 2010 +0200

    Merge commit 'upstream/0+20100202'


-- 
schism packaging