am d2fc4352: Merge change I6b618094 into eclair

Merge commit 'd2fc4352293b3c9c3a3570a52826f6d98d0d052c' into eclair-mr2

* commit 'd2fc4352293b3c9c3a3570a52826f6d98d0d052c':
  Fix build.