Comment 6 for bug 677454

I'm attaching a branch under development (based off v6.0): it does not yet completely fix this bug, but provides the infrastructure for it.
Philippe and I won't work on it for at least a few weeks, but then we intend to make a proper merge proposal in the trunk.
Please feel free to comment here now.
Lionel.