Merge change I502d5a9b into eclair-mr2

* changes:
  construct event-log-tags via the new build mechanism