am 9f49d26d: am 043c6737: am ed10d655: Merge change Ia98fd30d into eclair

Merge commit '9f49d26ded41676c96289523be75063395a5cf1c'

* commit '9f49d26ded41676c96289523be75063395a5cf1c':
  Restore missing string that was still referenced from code.