Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Paul Saman <jean-paul.saman@m2x.nl>
Fri, 11 Apr 2008 08:53:45 +0000 (10:53 +0200)
committerJean-Paul Saman <jean-paul.saman@m2x.nl>
Fri, 11 Apr 2008 08:53:45 +0000 (10:53 +0200)

Trivial merge