[evolution/express2: 8/9] Merge branch 'express2' into express2-reduced-preferences

[Federico Mena Quintero <federico src gnome org>]

commit b360395495a273356355959c1067c00abf18e2d4
Merge: 5b5ac7a a16f089
Author: Federico Mena Quintero <federico novell com>
Date:   Fri Apr 9 15:09:46 2010 -0500

    Merge branch 'express2' into express2-reduced-preferences

 .../gui/contact-editor/e-contact-quick-add.c       |    2 +
 capplet/settings/mail-view.c                       |    3 -
 configure.ac                                       |   45 ++-
 e-util/e-datetime-format.c                         |    3 +
 mail/e-mail-browser.c                              |   12 +-
 mail/e-mail-display.c                              |    4 +-
 mail/e-mail-reader.c                               |    4 +
 mail/em-format-html.c                              |   68 +--
 mail/message-list.c                                |    8 +-
 modules/Makefile.am                                |    7 +-
 modules/mail/em-composer-prefs.c                   |    4 +
 modules/windows-sens/Makefile.am                   |   20 +
 modules/windows-sens/evolution-windows-sens.c      |  602 ++++++++++++++++++++
 shell/e-shell-utils.c                              |    2 +
 shell/e-shell-window-private.c                     |    2 +
 widgets/misc/e-web-view.c                          |    2 +
 16 files changed, 722 insertions(+), 66 deletions(-)
---