[SCM] vlc/master: Merge tag 'upstream/2.0.6'

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.0.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4071ca5ad3e74c3f4887856f068972c507209f2b
X-Git-Newrev: 4fdf67b3998845559160e27cb493fa336896b1f7

The following commit has been merged in the master branch:
commit ef52beec6a1574a63fb42dce6858e7c347de1497
Merge: 4071ca5ad3e74c3f4887856f068972c507209f2b 4f68085b34e3cdd499f73b760daccaff4efb4c1a
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Apr 8 15:46:45 2013 +0200

    Merge tag 'upstream/2.0.6'
    
    Upstream version 2.0.6


-- 
VLC media player packaging