Merge branch 'bug_241_EOFrestart'
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 7 Feb 2011 18:54:24 +0000 (19:54 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 7 Feb 2011 18:54:24 +0000 (19:54 +0100)

Trivial merge