# HG changeset patch # User Pat Downey # Date 1277381082 -3600 # Node ID 694c7d2282f23b288daeb5cc4e9b9ca795fd0e30 # Parent b46a585f69093cbda9edff47b69a0ee50239d115# Parent e1c7b0febd15b6dc0d06ef5ddf9f03e385bd421a Merge heads. diff -r b46a585f6909 -r 694c7d2282f2 phonebookui/pbkcommonui/resources/contacts_contactcard.docml diff -r b46a585f6909 -r 694c7d2282f2 phonebookui/pbkcommonui/resources/contacts_ev.docml diff -r b46a585f6909 -r 694c7d2282f2 phonebookui/pbkcommonui/resources/contacts_groupmembers.docml diff -r b46a585f6909 -r 694c7d2282f2 phonebookui/pbkcommonui/resources/contacts_history.docml diff -r b46a585f6909 -r 694c7d2282f2 phonebookui/pbkcommonui/resources/contacts_if.docml diff -r b46a585f6909 -r 694c7d2282f2 phonebookui/pbkcommonui/resources/contacts_mc.docml diff -r b46a585f6909 -r 694c7d2282f2 phonebookui/pbkcommonui/resources/contacts_namelist.docml