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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 40720e20b199f3935d3c4b5b0ab65bc905b7f338
X-Git-Newrev: 1a010b7327e9e0d3963cef3f277a5a66f62ae94b

The following commit has been merged in the master branch:
commit 1a010b7327e9e0d3963cef3f277a5a66f62ae94b
Merge: 40720e20b199f3935d3c4b5b0ab65bc905b7f338 2bf1a7cd97d46bb8c84d4717dee4779a377ebcf2
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 23 06:29:19 2011 +0100

    Merge commit 'upstream/1.4.1'


-- 
lives packaging