[gtk+/native-layout: 26/26] Merge branch 'master' into native-layout

[Tristan Van Berkom <tvb src gnome org>]

commit 4ef145bda678a4698e4a8fc21972b10b90c8ed59
Merge: 6e705d7 5f4309b
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Fri Jun 18 00:44:00 2010 -0400

    Merge branch 'master' into native-layout
    
    Conflicts:
    	gtk/Makefile.am
    	gtk/gtk.h
    	gtk/gtk.symbols
    	gtk/gtksizerequest.c

 NEWS                                  |   52 +
 configure.ac                          |    8 +-
 docs/faq/gtk-faq.sgml                 |    2 +-
 docs/reference/gtk/tmpl/gtkentry.sgml |    2 +
 docs/reference/gtk/tmpl/gtkrc.sgml    |    2 +-
 gdk/gdkevents.c                       |   45 +
 gdk/x11/gdkdevicemanager-core.c       |    6 +-
 gdk/x11/gdkdevicemanager-xi2.c        |   26 +-
 gtk/gtk.symbols                       |    1 +
 gtk/gtkapplication.c                  |  133 ++-
 gtk/gtkapplication.h                  |   18 +-
 gtk/gtkmenu.c                         |   36 +-
 gtk/gtkmenushell.c                    |   59 +-
 gtk/gtkmenushell.h                    |    9 +-
 gtk/gtkobject.h                       |    8 +
 gtk/gtksizerequest.c                  |    8 +-
 gtk/gtktextview.c                     |   20 +-
 gtk/gtktreesortable.c                 |    2 +-
 gtk/gtkwidget.c                       |    2 +
 modules/other/gail/gailmenuitem.c     |    4 +-
 po/es.po                              | 2149 +++++++++++++++++----------------
 tests/testapplication.c               |    2 +-
 22 files changed, 1416 insertions(+), 1178 deletions(-)
---