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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.60.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 81ef6320d9b8cb9a3e7a4930a2a41e84ab2cbd00
X-Git-Newrev: bdc2483821cd9a21801b627796cbeff57f445ef7

The following commit has been merged in the master branch:
commit bdc2483821cd9a21801b627796cbeff57f445ef7
Merge: 81ef6320d9b8cb9a3e7a4930a2a41e84ab2cbd00 74191abf52cd0f95e2a4b63943fbb873763750f4
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 27 08:45:15 2010 +0200

    Merge commit 'upstream/0.60.7'


-- 
bristol packaging