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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 23d10be2f6540c7fb38b60431c3f0a8fc8f52750
Merge: fa240285f0946af1f250f37c7bea4dd2552f7c04 f8a257bec8673656532e22c23cc2575f17f7f5bf
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jan 21 14:45:11 2012 +0100

    Merge commit 'upstream/1.6.0_ds1'


-- 
lives packaging