am 13f08cfc: am ed974e9e: Merge change 23724 into eclair

Merge commit '13f08cfc9e6919e39ef5036715c3dc171d4f698b'

* commit '13f08cfc9e6919e39ef5036715c3dc171d4f698b':
  Fix x86 call bridge