Merge branch 'master' into dvd_scale_test
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 9 Dec 2008 19:53:51 +0000 (20:53 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 9 Dec 2008 19:53:51 +0000 (20:53 +0100)

Trivial merge