Merge branch 'bug_747_cancel_waiting_tasks'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Sep 2011 20:58:53 +0000 (22:58 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Sep 2011 20:58:53 +0000 (22:58 +0200)

Trivial merge