am ed9880f3: am a35f1c63: Merge change Ib64ea2dd into eclair-mr2

Merge commit 'ed9880f399015782c9f635db744d25281d0deeb4'

* commit 'ed9880f399015782c9f635db744d25281d0deeb4':
  Improvements to TimedEventQueue.