Merge branch 'master' of git@git.videolan.org:vlc
authorRafaël Carré <funman@videolan.org>
Sun, 23 Mar 2008 22:28:03 +0000 (22:28 +0000)
committerRafaël Carré <funman@videolan.org>
Sun, 23 Mar 2008 22:28:03 +0000 (22:28 +0000)

Trivial merge