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

[Alexander Belchenko]

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

New version of my patch, reworked after John's review.

[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF9gs3zYr338mxwCURAvbZAJ9InyH7JYWbQlgUcZ9xTBfYxM6wjgCghH+n
BsRDiY7TZOv4WnAKVkZ0hEU=
=277B
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: selftest.win32-0.16.part2.v2.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070313/5834f10a/attachment-0001.diff