Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Paul Saman <jpsaman@videolan.org>
Wed, 28 May 2008 16:12:49 +0000 (18:12 +0200)
committerJean-Paul Saman <jpsaman@videolan.org>
Wed, 28 May 2008 16:12:49 +0000 (18:12 +0200)

Trivial merge