> I don't call that multi-master, though, so I guess we may have a bit of a
> terminology problem.

This is definately not a multi-master issue, I agree. It is just
another issue I saw when thinking about your patch thoroughly again.

> I'll see what I can come up with, but I am not sure if I'll find the time
> before the 4.1 commit window opens. Company has a working solution (kind of),
> so now I'll have to do this on my own time ;-).

But their solution is buggy and needs a fix! :)