Comment 22 for bug 992124

@Samuel - I don't know why, but your patch again fails to apply cleanly here (yes, I noticed that it is not against unmodified trunk, and patches an already patched version of the 'src/2geom' files: but still, 2 hunks do not apply). Do I have to manually fix this locally, or is there some option I could use with the 'patch' command to force it to apply your diffs?