Merge change Ibac388a3 into eclair-mr2

* changes:
  Add support for XING header