[SCM] lives/master: Merge commit 'upstream/1.6.2.ds1'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6.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: 2e01b6aaf924a8000d6340057961e580abc51307
X-Git-Newrev: e0bb0a8eaca528d40b7f34ebdd0306632f9d0936

The following commit has been merged in the master branch:
commit 784c630a9a39107bd09e29ec1b2c1d78c50b31e9
Merge: 51c0c864e2a9018b4cfefd3012ded820a596f138 e58b3e9c678d7cb91e550ff3b7df98a7b9dc0c98
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 26 08:35:36 2012 +0200

    Merge commit 'upstream/1.6.2.ds1'


-- 
lives packaging