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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 2d527f61a299519fd924f0a4c65184b6bc3269cb
Merge: 3f0ba1cd44af97e6c718018fbfeaeadd2a488e9a d89bad36f8b5bc8858f9a47470f95fa95a988310
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 19 10:48:31 2011 +0100

    Merge commit 'upstream/1.4.0'


-- 
lives packaging