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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.4.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6ad10cf8737f67d49e6829d0f2ca63f269340020
X-Git-Newrev: 58cb56aa8eaccec864ee88b5042ee82bbb2e3c44

The following commit has been merged in the master branch:
commit 4d61b164be7e011c2f9e5e4cc5f48d9fd99e8786
Merge: 6ad10cf8737f67d49e6829d0f2ca63f269340020 6bfce067c76804c06a99537630f582967bd58a13
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 30 10:05:53 2011 +0200

    Merge commit 'upstream/1.4.6'


-- 
lives packaging