Merge Darren's win32 build changes to the maintenance branch (since
they'll be handy there also).
Authored by: mdboom 2008-01-10
Parent: [r4845]
Child: [r4847]
