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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.3.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: 24ff529cd2e87a147904f8012c7aff8dc22a91e9
X-Git-Newrev: f22eea4aacf81c5a514e245ed8cf6496475ead8e

The following commit has been merged in the master branch:
commit 4d5e1a2f4c2953120f03a30a755eabb28f83602c
Merge: 24ff529cd2e87a147904f8012c7aff8dc22a91e9 7b4ee737992b9ea2096ca5b69c7d3bfd011b3508
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Sep 15 17:13:19 2010 +0200

    Merge commit 'upstream/1.3.8'


-- 
lives packaging