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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2~ds2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f2b183c278ae9c72dfdb1cc09c6742f8f3f3068f
X-Git-Newrev: 6d63e463c8204f2190965afead950177b42a88d9

The following commit has been merged in the master branch:
commit 5f09845b3827689888680f8c48aaf812505d6a48
Merge: f2b183c278ae9c72dfdb1cc09c6742f8f3f3068f 6f768493cd6166c0d362f44b0fc0899c37e47b12
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 4 23:23:46 2012 +0100

    Merge commit 'upstream/1.2_ds2'


-- 
tartini packaging