Merge change Ic5e3d73f into eclair-mr2

* changes:
  LOG_ASSERT needs a message.