Merge change I98f2db38 into eclair

* changes:
  FastTrack->QuickContact