Merge branch 'bug_615_replace_rawfile'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 23 Nov 2010 12:58:30 +0000 (13:58 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 23 Nov 2010 12:58:30 +0000 (13:58 +0100)

Trivial merge