Merge branch 'bug_615_replace_rawfile' into m2ts_test
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 23 Nov 2010 11:34:59 +0000 (12:34 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 23 Nov 2010 11:34:59 +0000 (12:34 +0100)

Trivial merge