Merge change Ie806375b into eclair-mr2

* changes:
  Adds toast for Geolocation permissions prompt.