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

[bdrung at users.alioth.debian.org]

Imported Upstream version 1.1.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 27ba48042d21ab15a1aef11753b3c383129950be
X-Git-Newrev: 3fbdf46f33e341bb905a5ddfe23a07deb74b84d5

The following commit has been merged in the master branch:
commit 3fbdf46f33e341bb905a5ddfe23a07deb74b84d5
Merge: 27ba48042d21ab15a1aef11753b3c383129950be 1df05c297f3ae6fc0a8f5a944124ffc021517ef7
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Jul 18 09:38:17 2011 +0200

    Merge commit 'upstream/1.1.11'


-- 
VLC media player packaging