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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 0368a6ee11910c284f80e3bbc6b334b6ccceb95a
Merge: b4f56c09a2216185ad3f20a0674ab9735b6f3880 2d1c17bf7153e40e4a3d88a9361d81f4ef6cc764
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Sep 15 09:14:41 2010 +0200

    Merge commit 'upstream/1.3.7'


-- 
lives packaging