am f9c2e07d: am 21b8dbe5: Merge change Ia8c35b58 into eclair-mr2

Merge commit 'f9c2e07d2cb65271d8def8d5562ecba52f69fd91'

* commit 'f9c2e07d2cb65271d8def8d5562ecba52f69fd91':
  Track library changes