backport mhammond's patch:

Fix bug 544473 - "Queue module can deadlock".
Use try/finally to ensure all Queue locks remain stable.
Includes test case.  Bugfix candidate.

(and branchpatch can now handle adding files :)