am 254e0025: am 791c626a: Merge change Ibac388a3 into eclair-mr2

Merge commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542'

* commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542':
  Add support for XING header