From: Derk-Jan Hartman <hartman@videolan.org>
Date: Tue, 26 May 2009 14:10:57 +0000 (+0200)
Subject: Merge commit 'origin/1.0-bugfix'
X-Git-Tag: 1.1.0-ff~5749
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=74e5a0727b83ea8bd5ee87dbce7596b990ef14c1;p=vlc

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

74e5a0727b83ea8bd5ee87dbce7596b990ef14c1