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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 9d1d5d4da7d3d3382e94bde02a9be9500636cd6b
Merge: 945fd353bd8b005fceca7d0cc06a75cb33f47fc2 56895e9401f7ce0dc35dccf6850477ca1c30c620
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Jan 31 23:01:40 2011 +0100

    Merge commit 'upstream/1.1.7'


-- 
VLC media player packaging