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

[bdrung at users.alioth.debian.org]

Imported Upstream version 1.1.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 51275a9741739f4ae3421c56fd19f41504cbeaa0
X-Git-Newrev: 471f5201fd35f71442cc86e08b800d7de7ce1c02

The following commit has been merged in the master branch:
commit 471f5201fd35f71442cc86e08b800d7de7ce1c02
Merge: 51275a9741739f4ae3421c56fd19f41504cbeaa0 2593041ebedd0dcdbd30415c19e90ee4374b3fea
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Jun 6 22:39:58 2011 +0200

    Merge commit 'upstream/1.1.10'


-- 
VLC media player packaging