Merge change Ia8c35b58 into eclair-mr2

* changes:
  Track library changes