[SCM] lives/master: Merge commit 'upstream/1.6.0_ds0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6.0~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: fd1fe8170ad01ebae7d21b1ca4349ff0861e1729
X-Git-Newrev: 29f933a1ff147fe7a246c3b8bf6cb3bc70c3af40

The following commit has been merged in the master branch:
commit 29f933a1ff147fe7a246c3b8bf6cb3bc70c3af40
Merge: d2778bd3beb35551cb61fa2870cbf328db729aea 76fb75a573fc80bdd72f24a7c91738402dd577fa
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jan 21 14:36:09 2012 +0100

    Merge commit 'upstream/1.6.0_ds0'


-- 
lives packaging