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

[alessio at users.alioth.debian.org]

Imported Upstream version 11.06
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 187585e98400f873feab45d3ba3ac9768cc537c2
X-Git-Newrev: 5f078e3ff3360b7e2976d9df35135b0437b8e1d4

The following commit has been merged in the master branch:
commit 5f078e3ff3360b7e2976d9df35135b0437b8e1d4
Merge: 187585e98400f873feab45d3ba3ac9768cc537c2 7f3cc0e680488dbca96c79a99e31f482a52615c7
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 19 19:58:16 2011 +0200

    Merge commit 'upstream/11.06'


-- 
rosegarden packaging