resolved conflicts for merge of 041c9c26 to eclair
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.