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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.060.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: 60c90ffc4c2292828e8fa6d5fe6fecec91bf290c
X-Git-Newrev: fb75134b1e9406921ae1ec6c5ba60f4208984d98

The following commit has been merged in the master branch:
commit 1a4a252786e7a7a5434a88de5d4dbcd0a54ab5f1
Merge: 60c90ffc4c2292828e8fa6d5fe6fecec91bf290c 4d07af5c0bfaa7941935cd392db4968110c7bf7e
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 6 01:30:31 2010 +0100

    Merge commit 'upstream/0.060.1'


-- 
yoshimi packaging