Merge branch 'master' of git@git.videolan.org:vlc
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 15 Apr 2009 20:27:33 +0000 (23:27 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 15 Apr 2009 20:27:33 +0000 (23:27 +0300)

Trivial merge