Merge commit 'origin/1.0-bugfix'
authorDerk-Jan Hartman <hartman@videolan.org>
Tue, 26 May 2009 14:10:57 +0000 (16:10 +0200)
committerDerk-Jan Hartman <hartman@videolan.org>
Tue, 26 May 2009 14:10:57 +0000 (16:10 +0200)

Trivial merge