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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.60.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 666014a38fc546e1b67df9f2779ed168e4995d34
X-Git-Newrev: 3806a5f2de1f933e46c20e66dfda3bbdaeed1f28

The following commit has been merged in the master branch:
commit 3806a5f2de1f933e46c20e66dfda3bbdaeed1f28
Merge: 666014a38fc546e1b67df9f2779ed168e4995d34 b2fc03ea8c9c95da09d37320c91aae00ebaad064
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 27 01:15:36 2010 +0100

    Merge commit 'upstream/0.60.8'


-- 
bristol packaging