[SCM] mixxx/master: Merge commit 'upstream/1.8.0.2'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 5cb50c6cfea4e06e2c5016b7e7d139d0cc812a59
Merge: cbcd6fa4f4293596381b7c1ca058c497c9909ae0 63d430bdf87e399852c0d0a38b5236ca22dd3222
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 15 13:25:08 2010 +0200

    Merge commit 'upstream/1.8.0.2'


-- 
mixxx packaging