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

[Rodrigo Moya <rodrigo src gnome org>]

commit bd149b27954af20cf3f860164486191b0e879e89
Merge: 3b32549 8c67e84
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Mon Oct 24 11:30:20 2011 +0200

    Merge branch 'master' into wip/gsettings

 Makefile.am                                    |    1 +
 NEWS                                           |  114 +
 addressbook/gui/widgets/eab-gui-util.c         |    7 +
 capplet/anjal-settings-main.c                  |    2 +
 capplet/settings/mail-guess-servers.c          |    2 +
 configure.ac                                   |    2 +-
 e-util/e-signature-list.c                      |    3 +
 e-util/e-util.c                                |   16 +-
 e-util/gconf-bridge.c                          |    1 +
 mail/e-mail-backend.c                          |   15 +-
 mail/e-mail-reader.c                           |  105 +-
 modules/mail/e-mail-config-web-view.c          |   35 +-
 po/es.po                                       |  673 +-
 po/nb.po                                       | 5941 +++++++-------
 po/sl.po                                       |10172 +++++-------------------
 shell/main.c                                   |    2 +
 shell/test/Makefile.am                         |    3 +
 widgets/e-timezone-dialog/e-timezone-dialog.c  |    2 +-
 widgets/e-timezone-dialog/e-timezone-dialog.ui |   26 +-
 widgets/menus/gal-view-etable.c                |    1 +
 widgets/misc/e-account-tree-view.c             |    3 +
 widgets/misc/e-signature-tree-view.c           |    2 +
 widgets/table/e-cell-hbox.c                    |    2 +-
 widgets/table/e-cell-vbox.c                    |    2 +-
 24 files changed, 5705 insertions(+), 11427 deletions(-)
---