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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.060.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5abc53a42b5228e2069c1a826da0a420bd8d0610
X-Git-Newrev: a4c4922d649952d9025e7753f05b07fdadbe3881

The following commit has been merged in the master branch:
commit a4c4922d649952d9025e7753f05b07fdadbe3881
Merge: 5abc53a42b5228e2069c1a826da0a420bd8d0610 f799ba1d07d4c2a67ea77365bbd5daa0be698cc6
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 12 11:48:27 2011 +0200

    Merge commit 'upstream/0.060.10'


-- 
yoshimi packaging