[MERGE] Win32 fixes

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On the subject of Windows, there's one bug I'm having a hell of a time
with.  It's a merge test: test_contents_merge2 -- it invokes diff3 on
files in a temp directory, then tries to delete the temp directory.

shutil.rmtree fails to delete the BASE file, with permission denied, for
no good reason I can tell.  I can successfully remove it using os.remove
after the tests have completed.

Any chance you could have a look at that one?  I'm stumped.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFESWkT0F+nu1YWqI0RAtiAAJ9MdMklgwDyq1uFmE4ezbTDab99RgCff7Dp
Jq8u5bXw1mb+Fxy5oWHUkUI=
=hYPg
-----END PGP SIGNATURE-----