Merge change Icae1a990 into eclair-mr2

* changes:
  Adding NAME_RAW_CONTACT_ID column to Contacts.