[MERGE] fixes for selftest on win32 (part 2)

[John Arbash Meinel]

John Arbash Meinel has voted +1 (conditional).
Status is now: Conditionally approved
Comment:
This is pretty close. I sent a couple of comments to the list. But if 
you respond, I don't need to see another bundle before you submit this 
for merging.

(Maybe we should have a NEWS entry for the difference between 
bzr-0.15rc1 and whatever the next release is)


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