Merge branch 'bug_747_cancel_waiting_tasks'
authorghost <[email protected]>
Wed, 14 Sep 2011 20:58:53 +0000 (22:58 +0200)
committerghost <[email protected]>
Wed, 14 Sep 2011 20:58:53 +0000 (22:58 +0200)

Trivial merge