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

Trivial merge