[SCM] yoshimi/master: Merge commit 'upstream/0.060.3.1'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.060.3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bf9e24406af6aa65278fd0eb4297b574782e6129
X-Git-Newrev: 1b1f3451d621b29f7755fdf949c55dc42f6e6d8b

The following commit has been merged in the master branch:
commit 1b1f3451d621b29f7755fdf949c55dc42f6e6d8b
Merge: bf9e24406af6aa65278fd0eb4297b574782e6129 1ec307332af860a209cfe6a623f9802971def605
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 22 09:04:50 2010 +0100

    Merge commit 'upstream/0.060.3.1'


-- 
yoshimi packaging