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

[bdrung-guest at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 6887b391ccfb88c6346974e365370adc1e7dfae8
Merge: c43b73dd5e8259745edccaf135d63a5d3ceb91fa db55a4861b79a9f22bdc23be1609f76e10b9480f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Nov 14 19:25:02 2010 +0100

    Merge commit 'upstream/1.1.5'


-- 
VLC media player packaging