[SCM] lives/master: Merge tag 'upstream/1.6.4_ds1' into master.experimental

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6.4~ds1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2db1f867b498fbb0fcf5101ef4884df582a79867
X-Git-Newrev: f442365a62dc138bbf7e635e3cc48612756472f0

The following commit has been merged in the master branch:
commit b3fcb3febec732c2d0ade4c4c45cd8d561c0fbc3
Merge: 39a370a82c143b172d06237d97fb529b33ff1c5a c11467774f94e3fed86e28144f0fc26ee6fd4840
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Oct 21 18:59:50 2012 +0100

    Merge tag 'upstream/1.6.4_ds1' into master.experimental
    
    Upstream version 1.6.4~ds1


-- 
lives packaging