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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6.1~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: 556c461118c9ddd992c6b43c6cb58309bd2ebfbe
X-Git-Newrev: c0a00bb3652283732192ffca35f3a5b78ac561ef

The following commit has been merged in the master branch:
commit 659e3c6b92d455cdf3228be3e1addb3c9d1d0bc6
Merge: 556c461118c9ddd992c6b43c6cb58309bd2ebfbe b455fd131b9ceba4e402057d37c2a8dc8cbabb83
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 4 17:21:25 2012 +0100

    Merge commit 'upstream/1.6.1_ds1'


-- 
lives packaging