Fix some problems with the win32 build script and also make it more friendly to repeated buildbot style runs.
Fix some problems with the win32 build script and also make it more friendly to repeated buildbot style runs.

git-svn-id: 38cedb3a26441909d4c4a02637a61d2c70533dbc@18597 55e972cd-5a19-0410-ae62-a4d7a52db4cd

secureteam13/torvm