[evolution/webkit-composer: 120/120] Merge branch 'master' into webkit-composer

[Dan VrÃtil <dvratil src gnome org>]

commit 63bae97d9876bc60bb166a3eb9946dce2f9c5b55
Merge: 6fe0218 4483209
Author: Dan VrÃtil <dvratil redhat com>
Date:   Tue Oct 9 23:36:13 2012 +0200

    Merge branch 'master' into webkit-composer

 configure.ac                                       |   30 ++++
 em-format/e-mail-formatter-text-plain.c            |    1 +
 modules/Makefile.am                                |    8 +-
 .../e-book-config-name-selector-entry.c            |   84 ++++++------
 .../e-book-config-name-selector-entry.h            |   40 +++++-
 modules/addressbook/evolution-module-addressbook.c |    2 +-
 modules/calendar/e-cal-config-calendar-item.c      |   61 +++++---
 modules/calendar/e-cal-config-calendar-item.h      |   40 +++++-
 modules/calendar/e-cal-config-comp-editor.c        |   60 +++++---
 modules/calendar/e-cal-config-comp-editor.h        |   39 +++++-
 modules/calendar/e-cal-config-date-edit.c          |   60 +++++---
 modules/calendar/e-cal-config-date-edit.h          |   39 +++++-
 modules/calendar/e-cal-config-meeting-store.c      |   61 +++++---
 modules/calendar/e-cal-config-meeting-store.h      |   39 +++++-
 .../calendar/e-cal-config-meeting-time-selector.c  |   62 +++++---
 .../calendar/e-cal-config-meeting-time-selector.h  |   40 +++++-
 modules/calendar/e-cal-config-model.c              |   59 +++++---
 modules/calendar/e-cal-config-model.h              |   39 +++++-
 modules/calendar/e-cal-config-view.c               |   59 +++++---
 modules/calendar/e-cal-config-view.h               |   37 +++++-
 modules/calendar/evolution-module-calendar.c       |   14 +-
 modules/mail/e-mail-config-format-html.c           |  151 ++++++++++++-------
 modules/mail/e-mail-config-format-html.h           |   40 +++++-
 modules/mail/e-mail-config-reader.c                |   60 +++++---
 modules/mail/e-mail-config-reader.h                |   39 +++++-
 modules/mail/e-mail-config-web-view.c              |  126 +++++++++--------
 modules/mail/e-mail-config-web-view.h              |   38 +++++-
 modules/mail/evolution-module-mail.c               |    6 +-
 .../e-mail-formatter-text-highlight.c              |   77 +++++++----
 29 files changed, 1000 insertions(+), 411 deletions(-)
---