Merge branch 'bug_241_EOFrestart' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 26 Jan 2011 14:31:09 +0000 (15:31 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 26 Jan 2011 14:31:09 +0000 (15:31 +0100)

Trivial merge