[SCM] bristol/master: Merge tag 'upstream/0.60.10'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.60.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: 1dc0ddded6595530abecc9a460aa82c1773fb75c
X-Git-Newrev: b01f1db07c980023c93880ed0c0acae48aad0818

The following commit has been merged in the master branch:
commit b01f1db07c980023c93880ed0c0acae48aad0818
Merge: 1dc0ddded6595530abecc9a460aa82c1773fb75c b19fec388e97e7ebef97d8e9f79f4e25dbe6df1d
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 1 11:02:30 2012 +0200

    Merge tag 'upstream/0.60.10'
    
    Upstream version 0.60.10


-- 
bristol packaging