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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit a6ac56a8102c6f52c3d9706cba514cbcafc87a6b
Merge: a3dc69fb536c042bad9a98e25368c377d83726b5 c55119b51169f8462693d78640f898a90351d4ff
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Sep 20 15:08:36 2010 +0200

    Merge commit 'upstream/1.3.10'


-- 
lives packaging