Merged missed 1970 changes - windows build fix
Authored by: artyom-beilis 2011-10-18
Parent: [r1998]
Child: [r2000]