Merge branch 'bug_615_replace_rawfile'
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 26 Nov 2010 18:12:37 +0000 (19:12 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 26 Nov 2010 18:12:37 +0000 (19:12 +0100)

Trivial merge