[SCM] VLC media player packaging branch, master, updated. debian/1.1.3-2-5-ge47316d

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

The following commit has been merged in the master branch:
commit 691088b894e47ab9a66c330fee621600fda1ca3a
Merge: f427dc85838ff7641e0505e869f2b463da159d9b deccd261b747b0870336e9dafcd52a07e89ab4f0
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Fri Aug 27 21:17:06 2010 +0200

    Merge commit 'upstream/1.1.4'


-- 
VLC media player packaging