Diffs from John Fairhurst mjf35@hermes.cam.ac.uk for OS/2
Diffs from John Fairhurst mjf35@hermes.cam.ac.uk for OS/2

makotokato/nsprpub,makotokato/nsprpub,makotokato/nsprpub,makotokato/nsprpub,makotokato/nsprpub