[MERGE] [BUG 363837] Catch OSError to make diff log debug message instead of passing win32 specific exception to stderr

[martitzam at gmail.com]

An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090512/53aee3a2/attachment-0001.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 270 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090512/53aee3a2/attachment-0001.pgp 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 363837_B.patch
Type: text/x-patch
Size: 3370 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090512/53aee3a2/attachment-0001.bin