Alexander Belnchenko found this error in <https://bugs.edge.launchpad.net/bzr/+bug/277481>; this is a cleaned-up version of the patch attached to that bug. -- Martin <http://launchpad.net/~mbp/>