[merge][rfc] dealing with knock-on errors

[Robert Collins]

Other than 'or True' this looks reasonable :)

-Rob
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090713/d15d1b42/attachment-0001.pgp