Oh my...

Here is the third (and hopefully final) version of the patch.

Sorry for the noise.

-- Nicolas