os2 patch by Jeff Rush
12 files changed