Merge change I237fc084 into eclair

* changes:
  Makes Geolocation permissions prompt pretty.