Fixes for windows
Merge branch 'master' of git://github.com/kipr/ks2
Building under windows