Help with cherrypick conflict

[James Westby]

Hi,

I spent some time investigating the bug at

https://bugs.launchpad.net/bzr/+bug/151731

but I do not know enough to be able to come up with a
solution.

Could someone else take a look please?

Thanks,

James