am f278fef2: (-s ours) Merge change I7c40cce5 into eclair

Merge commit 'f278fef2c7c4c802c1e18af4daafacfcc46ac3ae' into eclair-mr2

* commit 'f278fef2c7c4c802c1e18af4daafacfcc46ac3ae':
  DO NOT MERGE TO MR2