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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.060.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 342b85de479ae1732e900df4668ff13e9e69b73c
X-Git-Newrev: 98c61a3567df569d2dfcb5da51fc111dc0bacca4

The following commit has been merged in the master branch:
commit 98c61a3567df569d2dfcb5da51fc111dc0bacca4
Merge: 342b85de479ae1732e900df4668ff13e9e69b73c 693e5102c4d0bb5ea7b95efe54743e45ba67eba4
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Dec 28 12:17:36 2010 +0100

    Merge commit 'upstream/0.060.5'


-- 
yoshimi packaging