I'm not looking for my conversioning control tool to be smart enough to
understand the content of my files. There are enough compilers in the world who
tries to do so. Example #1 from Mads (msg7101) modifies different sets of lines,
so I don't see any reason for it to trigger a conflict.

That said, I'm glade with the patch from tonfa which does solves my problem.

And thus, I consider that issue resolved, any blockers not to push it to -stable ?