Merge branch 'bug_749_ethread_bugfix' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 11 Apr 2011 12:56:20 +0000 (14:56 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 11 Apr 2011 12:56:20 +0000 (14:56 +0200)

Trivial merge