[SCM] jnoise/master: Merge commit 'upstream/0.6.0'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit a793da62f6d01556eace3b709571716967635082
Merge: d5b91d430cd84c2869922eeb0f202ee4bf64fe52 96b860134f5834dcc0c8d6d63c7fb4b687c8aed7
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 11 01:08:21 2011 +0100

    Merge commit 'upstream/0.6.0'


-- 
jnoise packaging