am 126a1950: Add missing override.

Merge commit '126a19500c2d7d834d592a79e38ea6a0b678c94c' into eclair-mr2

* commit '126a19500c2d7d834d592a79e38ea6a0b678c94c':
  Add missing override.