am 15ec511b: am 38f95586: am 03e778b9: Merge change Ic4918c30 into eclair

Merge commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681'

* commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681':
  Fix a build break.  Too many branches to keep track of.