Attaching patch from comment #13 formatted with 'bzr diff' against current trunk (r12504) for easier review and testing.
Attaching patch from comment #13 formatted with 'bzr diff' against current trunk (r12504) for easier review and testing.