[MERGE][0.92] Reapply Aaron's fix for #94975

[Ian Clatworthy]

While investigating bug #140419, I found out that a fix of Aaron's has
been accidentally backed out by another merge. This patch reapplies that
patch.

This fix was in 0.18 but has been missing since. It should be considered
for 0.92 I think (though it's really, really late for a change to commit
code).

Ian C.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 94975.patch
Type: text/x-patch
Size: 5829 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070918/d405f9f0/attachment-0001.bin