am 9ad42745: am 9d73409e: Merge change Ic5e3d73f into eclair-mr2

Merge commit '9ad4274588374df796f7fb9f35d44476fc50c8de'

* commit '9ad4274588374df796f7fb9f35d44476fc50c8de':
  LOG_ASSERT needs a message.