[evolution/express2: 2/3] Merge commit 'origin/express2' into express2

[Michael Meeks <michael src gnome org>]

commit 8be2a0df7dfa830f9bfeeecfdf5551f1bbe1bd0a
Merge: 476ad28 20cb61b
Author: Michael Meeks <michael meeks novell com>
Date:   Mon May 10 15:41:28 2010 +0100

    Merge commit 'origin/express2' into express2

 composer/e-composer-actions.c      |    8 --
 composer/e-composer-actions.h      |    2 -
 composer/e-composer-from-header.c  |   10 ---
 composer/e-composer-from-header.h  |    3 -
 composer/e-composer-header-table.c |  134 ++++++++++++++++++------------------
 composer/e-composer-header.c       |  107 ++---------------------------
 composer/e-composer-header.h       |    3 -
 composer/e-composer-name-header.c  |   32 ++-------
 composer/e-composer-name-header.h  |    8 --
 composer/e-composer-private.c      |   23 ++++---
 composer/e-composer-text-header.c  |   22 +++---
 composer/e-composer-text-header.h  |    4 +-
 composer/e-msg-composer.c          |   34 +++------
 composer/e-msg-composer.h          |    3 -
 composer/evolution-composer.ui     |    1 -
 mail/em-composer-utils.c           |   34 ++--------
 mail/em-composer-utils.h           |    1 -
 mail/evolution-mail.schemas.in     |   15 ----
 widgets/misc/e-account-combo-box.c |   22 ++++++
 widgets/misc/e-account-combo-box.h |    2 +
 20 files changed, 146 insertions(+), 322 deletions(-)
---