Merge change I8d87cd98 into eclair-mr2

* changes:
  Fix various compiler warnings accumulated over time.