Merge branch 'bug_747_cancel_waiting_tasks' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 11 Apr 2011 16:41:13 +0000 (18:41 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 11 Apr 2011 16:41:13 +0000 (18:41 +0200)

Trivial merge