Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Paul Saman <jpsaman@videolan.org>
Mon, 14 Apr 2008 13:44:31 +0000 (15:44 +0200)
committerJean-Paul Saman <jpsaman@videolan.org>
Mon, 14 Apr 2008 13:44:31 +0000 (15:44 +0200)

Trivial merge