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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.060.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a5f3d7c64dc9228d4f8619b90562ab4ff6733c97
X-Git-Newrev: 815179bda1a62b019ed2e18dc6a57820ef6793ca

The following commit has been merged in the master branch:
commit 815179bda1a62b019ed2e18dc6a57820ef6793ca
Merge: a5f3d7c64dc9228d4f8619b90562ab4ff6733c97 6eeb9e8a434a3efe341856be1cd39aed41fe2944
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 5 15:01:42 2012 +0100

    Merge commit 'upstream/0.060.12'


-- 
yoshimi packaging