Merge branch 'master' of git@git.videolan.org:vlc
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 15 Feb 2009 17:26:12 +0000 (19:26 +0200)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 15 Feb 2009 17:26:12 +0000 (19:26 +0200)

Trivial merge