Use "native" format for the patch... MSVC changes the line endings when
you save, so the diff was generated with CRLFs, but the file isn't extracted
that way.

This file doesn't need to be binary.
Remove incorrectly binary file.
Re-add (hopefully not binary)
Merge branch 'master' of ../cvs/3rdp