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)
commit74e5a0727b83ea8bd5ee87dbce7596b990ef14c1
treeea46e8518b495a2a0a6e935d5d68b95f95b5f1c5
parentc5c06b64c806052086e5772d64e540a8db7e4a9b
parent8d5c75701a7351e90b617bb5395d71a6ac200666
Merge commit 'origin/1.0-bugfix'