Merge remote-tracking branch 'origin/bug_749_ethread_bugfix'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 6 Sep 2011 13:16:48 +0000 (15:16 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 6 Sep 2011 13:16:48 +0000 (15:16 +0200)

Trivial merge