[SCM] mixxx/master: Merge commit 'upstream/1.9.0+dfsg0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.9.0+dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5e9309492e5f65a36c3de5ac760a1be5be84bbb3
X-Git-Newrev: cb84abcf0ef4d193442a8b146f9cbaff06e16ef2

The following commit has been merged in the master branch:
commit 697f4c73e64383b21b38fbf7dfb13d7d1ab87190
Merge: 86f09ae3d167ff7611a30cb9cb21567ee2c1c2b9 601a0cfafec9266ffdd91a6484e12f910872379e
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 14 20:10:01 2011 +0200

    Merge commit 'upstream/1.9.0+dfsg0'


-- 
mixxx packaging