am 2f07ff1d: am e4ea0ab8: am ae91c7f8: Merge change I5ecba70c into eclair

Merge commit '2f07ff1d4b0e1772c03dc7d12fb113759e58e18b'

* commit '2f07ff1d4b0e1772c03dc7d12fb113759e58e18b':
  add missing comma