fix bad merge
The content of 37b52b938579
was broken by a hg branch --rev xxx
invocation. This small branch redo this merge to re-introduce the dropped content.
The content of 37b52b938579
was broken by a hg branch --rev xxx
invocation. This small branch redo this merge to re-introduce the dropped content.