From: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Sun, 25 Jan 2009 18:31:21 +0000 (+0200)
Subject: Merge commit 'videolan/master'
X-Git-Tag: 1.0.0-pre1~1057
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ff283ead4a3ec930becc2b382a175df13dee8cb9;p=vlc

Merge commit 'videolan/master'
---

ff283ead4a3ec930becc2b382a175df13dee8cb9