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

[bdrung at users.alioth.debian.org]

Imported Upstream version 1.1.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ecdba613111de3ad3030411e839084a49c3857e6
X-Git-Newrev: c2a56df107e7ab1575d9ee1e8cc600fe6e65bbd3

The following commit has been merged in the master branch:
commit c2a56df107e7ab1575d9ee1e8cc600fe6e65bbd3
Merge: ecdba613111de3ad3030411e839084a49c3857e6 b5aad2bf87094fe0b490bcb216c49eb646e2efe0
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Apr 13 16:23:24 2011 +0200

    Merge commit 'upstream/1.1.9'


-- 
VLC media player packaging