[SCM] snd/master: Merge commit 'upstream/12.0'

[alessio at users.alioth.debian.org]

Imported Upstream version 12.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: 61f3d33f89d65c60baba6213516d5221f0dae174
X-Git-Newrev: 8d0af679f10b5bb391c318bf9af81937c6379688

The following commit has been merged in the master branch:
commit 8d0af679f10b5bb391c318bf9af81937c6379688
Merge: 61f3d33f89d65c60baba6213516d5221f0dae174 e5328e59987b90c4e98959510b810510e384650d
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Mar 24 09:14:02 2011 +0100

    Merge commit 'upstream/12.0'


-- 
snd packaging