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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.4.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 58cb56aa8eaccec864ee88b5042ee82bbb2e3c44
X-Git-Newrev: cde18723d95d1256f450eaea526de4b714c897c1

The following commit has been merged in the master branch:
commit cde18723d95d1256f450eaea526de4b714c897c1
Merge: 58cb56aa8eaccec864ee88b5042ee82bbb2e3c44 90ceebbd33a6f8a2b35c62ee1eb98f3f1f2126c7
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Oct 20 15:13:24 2011 +0200

    Merge commit 'upstream/1.4.7'


-- 
lives packaging