[MERGE] win32 selftest improvements

[John Arbash Meinel]

John Arbash Meinel has voted +1.
Status is now: Approved
Comment:
You do a few other things that you didn't mention (like updating the 
'bzr cat' tests, and changing how 'numbered_dirs' worked).

Technically your numbered_dirs changes is not backwards compatible, but 
I don't think anyone was using the old method yet, so I'm okay with 
changing it.

Otherwise your patch seems fine.


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C461C64DF.1020705%40ukr.net%3E