am a8baf9bc: Merge change Ie7eb359a into eclair

Merge commit 'a8baf9bcc8d9776e9aba35207af17723f7226027' into eclair-mr2

* commit 'a8baf9bcc8d9776e9aba35207af17723f7226027':
  Tweaks to Pointer Location.