fix stupid cvs conflicts.I think that cvs is a poor lonesome, depressive program.The only way it has found of getting your attention is to throwsenseless conflicts that shouldn't exist in your way.
OpenBSD changes: synch somewhere between binutils-2.10 and 2.11Support for mkstemps in choose-temp.
branches: 1.1.1;Initial revision