am b2e9e7dd: am d5b090b2: am 348b92bd: Merge change Iee227ace into eclair

Merge commit 'b2e9e7dd4e027502682dfe4cb6242c3a5f3c1589'

* commit 'b2e9e7dd4e027502682dfe4cb6242c3a5f3c1589':