[evolution/wip/gsettings: 16/29] Merge branch 'master' into wip/gsettings

[Rodrigo Moya <rodrigo src gnome org>]

commit cb3e037f8f55f95892104326807d9988be87fbe4
Merge: b77871e ee5ca18
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Oct 13 12:55:34 2011 +0200

    Merge branch 'master' into wip/gsettings

 .../contact-list-editor/e-contact-list-editor.c    |   51 ++++----
 calendar/gui/e-calendar-view.c                     |   16 ++-
 calendar/gui/e-calendar-view.h                     |    3 +-
 configure.ac                                       |    7 +-
 mail/e-mail-store.c                                |    4 +-
 mail/em-folder-tree.c                              |   38 ++++++-
 mail/mail-config.ui                                |    2 +
 modules/addressbook/autocompletion-config.c        |    2 +-
 modules/online-accounts/e-online-accounts-google.c |    4 +
 .../org-gnome-backup-restore.error.xml             |    8 +-
 plugins/google-account-setup/google-source.c       |    9 --
 plugins/mark-all-read/mark-all-read.c              |   33 +++---
 plugins/pst-import/pst-importer.c                  |  121 +++++++++++++++++---
 po/es.po                                           |   60 +++++-----
 shell/e-shell-migrate.c                            |   10 +-
 shell/e-shell-window-actions.c                     |    2 +-
 widgets/text/e-text.c                              |    6 +-
 widgets/text/e-text.h                              |    1 +
 18 files changed, 251 insertions(+), 126 deletions(-)
---