Merge branch 'bug_615_replace_rawfile'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 24 Nov 2010 15:11:27 +0000 (16:11 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 24 Nov 2010 15:11:27 +0000 (16:11 +0100)

Trivial merge