am db08d5cd: (-s ours) DO NOT MERGE.
Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2 * commit 'db08d5cd441424e4f9621aae7c2414934f781400': DO NOT MERGE.
This commit is contained in: