[evolution: 8/8] Merge branch 'vcard-inline'

[Matthew Barnes <mbarnes src gnome org>]

commit 23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf
Merge: 292aea6... 43f4311...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed May 20 16:50:38 2009 -0400

    Merge branch 'vcard-inline'

 addressbook/gui/component/component-factory.c      |    4 -
 addressbook/gui/widgets/Makefile.am                |    2 -
 addressbook/gui/widgets/eab-vcard-control.c        |  316 --------------------
 addressbook/gui/widgets/eab-vcard-control.h        |   28 --
 configure.in                                       |    3 +-
 mail/em-format-html-display.c                      |  208 +-------------
 plugins/vcard-inline/Makefile.am                   |   20 ++
 .../vcard-inline/org-gnome-vcard-inline.eplug.xml  |   28 ++
 plugins/vcard-inline/vcard-inline.c                |  287 ++++++++++++++++++
 9 files changed, 343 insertions(+), 553 deletions(-)