Prefer time.clock() over time.time() on win32 for uuid generation.
Fix merge conflict