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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit cd17ab9cf109f18b45ba65a5cbfee1ccd9b473cd
Merge: bdbf0f5f3ee851f3857f5945f19102336228710b 1a904d61f6149a3ddcc400050aab6b1fcd278488
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Mar 24 12:00:58 2011 +0100

    Merge commit 'upstream/1.1.8'


-- 
VLC media player packaging