[SCM] bristol/master: Merge commit 'upstream/0.60.9'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.60.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 33699c0d1d729de3fd1c3f1b15f8b96a1c09ab87
X-Git-Newrev: 8d6774956ed332d15d7cb259e2b34c1b9f846dba

The following commit has been merged in the master branch:
commit 8d6774956ed332d15d7cb259e2b34c1b9f846dba
Merge: 33699c0d1d729de3fd1c3f1b15f8b96a1c09ab87 02e9ef8f4f9fd2b43bf1a6f4e154715c736c4027
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 14 06:09:11 2011 +0100

    Merge commit 'upstream/0.60.9'


-- 
bristol packaging