From: Derk-Jan Hartman <hartman@videolan.org>
Date: Thu, 31 Jul 2008 22:41:33 +0000 (+0200)
Subject: Merge branch 'df-for-upstream' of git://repo.or.cz/vlc/davidf-public
X-Git-Tag: 0.9.0-test3~76
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=35824733e305214dfada18dd6362cfa02a86dcd3

Merge branch 'df-for-upstream' of git://repo.or.cz/vlc/davidf-public
---

35824733e305214dfada18dd6362cfa02a86dcd3