Merge change Ice18ecc3 into eclair

* changes:
  Fix collapsing to do fuzzy phone number matching.