[SCM] rosegarden/master: Merge commit 'upstream/11.11.11'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit dc23e1fb60b2cdc63f10b91a30e5ca0d8e6b2195
Merge: e0be8c408da3998449270682ab95834476213252 9c42dcdfea0446a9d14b2016310a3b6f3467affa
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 5 00:22:42 2011 +0100

    Merge commit 'upstream/11.11.11'


-- 
rosegarden packaging