am b7a69ce8: am fe324a61: Merge change I8d87cd98 into eclair-mr2

Merge commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420'

* commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420':
  Fix various compiler warnings accumulated over time.