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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 7ee000939bd1259c0e74ba7a293b525e9c955f77
Merge: 1a8fbeb11846740e4e2a313017ab19fc0f634c90 ad575c980821fb4826819e2d0b8cb3d9966aa423
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 30 09:23:42 2011 +0200

    Merge commit 'upstream/1.4.2'


-- 
lives packaging