Merge branch 'bug_615_replace_rawfile' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 16 Nov 2010 14:28:52 +0000 (15:28 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 16 Nov 2010 14:28:52 +0000 (15:28 +0100)

Trivial merge