am 5edd0cbd: Fix build.

Merge commit '5edd0cbd1ae954dc8e97daef1a99375246bf985c' into eclair-mr2

* commit '5edd0cbd1ae954dc8e97daef1a99375246bf985c':
  Fix build.