[MERGE] Misc fixes for win32

[Aaron Bentley]

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

Vincent Ladeuil wrote:
>     aaron> I had to tweak it slightly:
> 
> Thanks for that. Do you still have the tests that were triggering
> that one ?

Among others, the test_bzrdir.ChrootedTests.*open_containing tests.  I
think they were skipping because PyCurl wasn't installed, but the
teardown code was failing.  I can't reproduce it here, though.

> Could it be because no connection were done to the
> server ?

Yes, it seems likely.  (The error was about closing a socket that wasn't
open).

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

iD8DBQFHd/cp0F+nu1YWqI0RAvh1AJwOoDl8MWdzCwdDUSzWuV+Xb/ZMqgCgge99
3qewAK9EkFPDy3QwjWE48uE=
=7QAy
-----END PGP SIGNATURE-----