Merge change Ic4918c30 into eclair

* changes:
  Fix a build break.  Too many branches to keep track of.