[SCM] audacity/master: Merge commit 'upstream/2.0.0_rc6'

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.0.0~rc6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5e2d264ee527dc24d2fc73698ba088f7bbfe207b
X-Git-Newrev: 0f2603f1f7a1976bbe9f9c3f760f403e390c24a7

The following commit has been merged in the master branch:
commit 60d5983f69ca8c08a0f1a3cbf6c266c2bec07718
Merge: 5e2d264ee527dc24d2fc73698ba088f7bbfe207b 97736257b3020616b023237e47ae3ed453ebf417
Author: Benjamin Drung <bdrung at debian.org>
Date:   Wed Feb 29 01:23:45 2012 +0100

    Merge commit 'upstream/2.0.0_rc6'


-- 
Audacity debian packaging