Merge change Ie7eb359a into eclair

* changes:
  Tweaks to Pointer Location.