Merge branch 'master' into dvd_scale_test
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Dec 2008 15:08:50 +0000 (16:08 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Dec 2008 15:08:50 +0000 (16:08 +0100)

Trivial merge