[SCM] tartini/master: Merge commit 'upstream/1.2_ds0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2~ds0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1e05e4ed2b23a67388a2804979625d4910ae6431
X-Git-Newrev: a1a5dfe46747a9e9a4b14d348fa57824893d224f

The following commit has been merged in the master branch:
commit 2abeb5540f3353dbdf5ae68f970ca68c1cc89440
Merge: 1e05e4ed2b23a67388a2804979625d4910ae6431 dc272826900fba297db32b7af78fb391360df8c8
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 28 10:57:42 2011 +0100

    Merge commit 'upstream/1.2_ds0'


-- 
tartini packaging