[MERGE] Win32 fixes

[Aaron Bentley]

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

Alexander Belchenko wrote:
| Aaron, can you include to your branch my patch for deleting read-only
| files and directories in test temp_dir after selftest finishing? This
| patch has been accepted in bzr 0.7, but since lost in bzr.dev.

I'll make sure something like this gets in.  Preferably something like
osutil.rmtree(), so it's easy to use.

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

iD8DBQFESYId0F+nu1YWqI0RAk5HAJ41oT2qkI9DeIRiwS+7DSwQ0tLxGgCcDFuZ
mpOxhhzJ8rF7IwXa8lrlgRk=
=YfbK
-----END PGP SIGNATURE-----