Merge branch 'enable_experimental_m2ts_support' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 3 Nov 2009 18:53:20 +0000 (19:53 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 3 Nov 2009 18:53:20 +0000 (19:53 +0100)

Trivial merge