Merge branch 'master' of git@git.videolan.org:vlc
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 31 May 2009 19:32:09 +0000 (22:32 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 31 May 2009 19:32:09 +0000 (22:32 +0300)

Trivial merge