Comment 8 for bug 679753

Patch no. 1 changes the matching algorithm. On images that I tested it gave the same or better results, but in theory there can be some regression with some images.
Patch no. 6 changes the written pto files because the original behavior was IMHO buggy.

Otherwise there are no changes for existing users.