Merge change Ie80e2381 into eclair

* changes:
  DO NOT MERGE: Squashed commit of the following: