Merge remote branch 'origin/bug_135_dvdburn_ts_only'
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 2 Jan 2010 09:58:47 +0000 (10:58 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 2 Jan 2010 09:58:47 +0000 (10:58 +0100)

Trivial merge