[MERGE] win32-specific fixes for selftest (all blackbox tests pass!)

[Andrew Bennetts]

Alexander Belchenko wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Andrew Bennetts пишет:
> > A few comments, but I'm basically happy for this to be merged.  Thanks so much
> > for doing this.
> 
> Thanks for review. I'll rework my patch today, but I want to have this patch in 0.15.
> And I apologize for this:

For 0.15, I think it's ok to have your patch merged as is (although that's up to
the release manager).  So my comments are really about what I want to see for
your changes to reach bzr.dev.

-Andrew.