[SCM] vlc/master: Merge commit 'upstream/2.0.0'

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0158e2a178a7ef05df8624fbe3799b2a4b081433
X-Git-Newrev: 6b825731cfa03b2bc5b5ab2b72176765a543f44c

The following commit has been merged in the master branch:
commit acfab9a9509558106a6ba5d3be1f667168db01b2
Merge: 0158e2a178a7ef05df8624fbe3799b2a4b081433 e00b03c84cd3121e76b59428efb5894363ac2ff8
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Feb 18 01:27:36 2012 +0100

    Merge commit 'upstream/2.0.0'


-- 
VLC media player packaging