Please, please, please: merge 3 patches for win32

[Martin Pool]

Thanks Alexander and Aaron, merged in.

I will take also the short-option fix, the ls fix, and call that 0.6
if there's nothing else urgent/

--
Martin