From: Steinar Gunderson <sgunderson@bigfoot.com>
Date: Sun, 26 Sep 2010 16:21:55 +0000 (+0200)
Subject: Merge branch 'master' of git://git.videolan.org/vlc
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=b93670e1dce5ba4bebc66db8d78864d865672b68

Merge branch 'master' of git://git.videolan.org/vlc
---

b93670e1dce5ba4bebc66db8d78864d865672b68