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)
commitff283ead4a3ec930becc2b382a175df13dee8cb9
treeb68743c1ab93ef2cc24df119c5a1577d26dd107e
parent72218fb9b9ba6c9f5a36bd3d3cfb1557a5491452
parent3e97bc6eafb412ea3bdc53437e343b119a0a3307
Merge commit 'videolan/master'