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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2~ds1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 81a01bdf22080266db3173c9ed17a7553a4dd430
X-Git-Newrev: 198e2a53455c013b2c882fd7b8e0398b6400ae16

The following commit has been merged in the master branch:
commit 6154820c885abcec764dcd6de700548a64113ed9
Merge: 81a01bdf22080266db3173c9ed17a7553a4dd430 6b095d09d9b67ab52139be2ddf5e155ecf38e96f
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 28 11:12:36 2011 +0100

    Merge commit 'upstream/1.2_ds1'


-- 
tartini packaging