am 371071c1: am e9d8f545: am 6903d5ce: Merge change Iee649a81 into eclair

Merge commit '371071c195138312a8829c198b24b7cb41bf7bc2'

* commit '371071c195138312a8829c198b24b7cb41bf7bc2':