From: Laurent Aimar <fenrir@videolan.org>
Date: Sat, 16 May 2009 21:26:19 +0000 (+0200)
Subject: Merge commit 'origin/1.0-bugfix'
X-Git-Tag: 1.1.0-ff~5904
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=24cddfa0efa80557f538d6dbf08f9b0b4b4d52a4;p=vlc

Merge commit 'origin/1.0-bugfix'
---

24cddfa0efa80557f538d6dbf08f9b0b4b4d52a4