Merge change I8f5e405f into eclair-mr2

* changes:
  mGeolocationDatabasePath needs to compare mGeolocationDatabasePath