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

[bdrung at users.alioth.debian.org]

Imported Upstream version 1.1.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: 365082430409c615c562fe4d1a6f01f12b46feb1
X-Git-Newrev: 0c1375cf7f62839ab13beb8f80e3bd890fb004cf

The following commit has been merged in the master branch:
commit 7ac7f7062675c4b970800d4b8c3e68285b6c2559
Merge: 365082430409c615c562fe4d1a6f01f12b46feb1 f320c56269e5e811e223fbc7313c9d829bb0297e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Jan 24 12:03:08 2011 +0100

    Merge commit 'upstream/1.1.6'


-- 
VLC media player packaging