am d135b093: (-s ours) Fix broken build. (do not merge)

Merge commit 'd135b0937875b405a20f735189040d5cb4d2546d' into eclair

* commit 'd135b0937875b405a20f735189040d5cb4d2546d':
  Fix broken build. (do not merge)