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

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

commit 1fbd62980b219a0b7cf7bf6f927c68f95db0c2c1
Merge: 5ee7b56 164d4ae
Author: Dan VrÃtil <dvratil redhat com>
Date:   Thu Aug 23 19:02:29 2012 +0200

    Merge branch 'master' into webkit-composer

 .../gui/contact-list-editor/contact-list-editor.ui |    2 +-
 calendar/gui/e-cal-model.c                         |   10 +-
 configure.ac                                       |    2 +-
 e-util/e-util.c                                    |    2 +-
 help/C/sync-with-other-devices.page                |    4 +-
 help/es/es.po                                      | 1134 +-
 modules/calendar/e-cal-shell-sidebar.c             |   16 +
 modules/calendar/e-memo-shell-sidebar.c            |   16 +
 modules/calendar/e-task-shell-sidebar.c            |   16 +
 .../e-mail-formatter-text-highlight.c              |   25 +-
 po/id.po                                           | 1884 +--
 po/lt.po                                           | 3598 ++--
 po/nb.po                                           | 3165 ++--
 po/vi.po                                           |18969 ++++++++++----------
 po/zh_HK.po                                        | 1993 +--
 po/zh_TW.po                                        | 2002 +--
 widgets/misc/e-source-config.c                     |    4 +
 widgets/text/gal-a11y-e-text.c                     |   27 +-
 18 files changed, 16428 insertions(+), 16441 deletions(-)
---
diff --cc configure.ac
index f2ff5aa,3eccc16..51175f0
--- a/configure.ac
+++ b/configure.ac
@@@ -32,9 -32,8 +32,9 @@@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_
  
  dnl Required Packages
  m4_define([glib_minimum_version], [2.32.0])
- m4_define([gtk_minimum_version], [3.2.0])
+ m4_define([gtk_minimum_version], [3.4.0])
  m4_define([eds_minimum_version], [evo_version])
 +m4_define([enchant_minimum_version], [1.1.7])
  m4_define([gtkhtml_minimum_version], [4.5.2])
  m4_define([gnome_desktop_minimum_version], [2.91.3])
  m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])