Attached is a bzr bundle that should fix this issue.