Merge commit 'videolan/master'
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 25 Jan 2009 18:31:21 +0000 (20:31 +0200)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 25 Jan 2009 18:31:21 +0000 (20:31 +0200)

Trivial merge