[MERGE][0.15] Small updates for win32 support

[John Arbash Meinel]

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

Alexander Belchenko wrote:
> Alexander Belchenko has voted +1.
> Status is now: Approved
> Comment:
> It's better than nothing, especially if you need this to be merged.
> 
> Do you need fresh test.log from me?
> 

No, I'm working on win32 right now, so I see the test failures just fine.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF9qVsJdeBCYSNAAMRAreUAJ42nxCcCt4Opz8MdHdP7f+Xtyw3pgCfUIdg
OEN5E44lz96jxI5Jq6afyBE=
=B3ay
-----END PGP SIGNATURE-----