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

[alessio at users.alioth.debian.org]

Imported Upstream version 11.11.42
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 32de997a952a2b632e7239cb700f7f46f7a6868b
X-Git-Newrev: 378bfeb1c05459aa1f851a483d92a6ac6ec667f4

The following commit has been merged in the master branch:
commit 378bfeb1c05459aa1f851a483d92a6ac6ec667f4
Merge: de200b5139ad82a3462511dcc0e275fbcbb4f508 f2665d4a2d2865e48c87d017f4dcb15ecb700c00
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Dec 16 11:12:43 2011 +0100

    Merge commit 'upstream/11.11.42'


-- 
rosegarden packaging