Merge change Icaed50ed into eclair-mr2

* changes:
  Optimizing global search for contacts.