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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.4.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8db568de9b483d4f4a091a527e58fdbba8aefc78
X-Git-Newrev: 5a079b2f64f21bcc6173051b72153abb02012cfc

The following commit has been merged in the master branch:
commit 5a079b2f64f21bcc6173051b72153abb02012cfc
Merge: 8db568de9b483d4f4a091a527e58fdbba8aefc78 7ea024c53561429e18e1a8a48668fe6e64cd7125
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 3 13:36:47 2011 +0100

    Merge commit 'upstream/1.4.8'


-- 
lives packaging