am 43fa4d92: am ec83852a: am 281acf42: Merge change I52479480 into eclair

Merge commit '43fa4d920c1c43810fdc693aab1f3b7c4f41789a'

* commit '43fa4d920c1c43810fdc693aab1f3b7c4f41789a':