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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.3.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9cad2724c5639544d895a2335e7f6a550fab5ad5
X-Git-Newrev: 592e0e9b5d45dc27c478319cd38c65a8930772d1

The following commit has been merged in the master branch:
commit 592e0e9b5d45dc27c478319cd38c65a8930772d1
Merge: adac82d0c0c7d38545f20eb4b72791682dd82958 ab119d2a7ec35541e9e9b25491619374b7f555da
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Sep 9 21:33:37 2010 +0200

    Merge commit 'upstream/1.3.5'


-- 
lives packaging