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

[Rodrigo Moya <rodrigo src gnome org>]

commit 46b0d7f51334b6a7c6716b157fbf1b6f55fe5ff0
Merge: d46ec20 4378af9
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Fri Oct 14 13:03:09 2011 +0200

    Merge branch 'master' into wip/gsettings

 calendar/gui/itip-utils.c                 |   19 ++-
 help/C/import-supported-file-formats.page |    6 +-
 help/C/mail-encryption-s-mime-manage.page |    5 +-
 help/es/es.po                             |  139 ++++-------
 po/es.po                                  |  372 +++++++++++++++--------------
 shell/e-shell-window-actions.c            |    9 +
 smime/gui/smime-ui.ui                     |    6 +-
 7 files changed, 273 insertions(+), 283 deletions(-)
---