[SCM] lives/master: Merge commit 'upstream/1.3.9'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.3.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a035f14d2e2e3f9d02d6e9e7b0920d234181ce47
X-Git-Newrev: 953ad10e833ed72aa0f90360bd5b9bda3b135766

The following commit has been merged in the master branch:
commit 953ad10e833ed72aa0f90360bd5b9bda3b135766
Merge: a035f14d2e2e3f9d02d6e9e7b0920d234181ce47 b4ef701fa5d83ea895d01855f91275e093fbc7ea
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Sep 16 11:08:10 2010 +0200

    Merge commit 'upstream/1.3.9'


-- 
lives packaging