Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 24 Feb 2009 10:15:50 +0000 (11:15 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 24 Feb 2009 10:15:50 +0000 (11:15 +0100)

Trivial merge