[gtk+/quartz-integration: 18/18] Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

commit e598ec723d2877b6591e72181776b0ac8394d54c
Merge: ee10de0 c0daacc
Author: John Ralls <jralls ceridwen us>
Date:   Sun Feb 20 23:21:08 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/migrating-2to3.xml      |   39 +-
 gdk/win32/gdkdevicemanager-win32.c         |    5 +-
 gdk/win32/gdkevents-win32.c                |    2 +-
 gdk/x11/gdkcursor-x11.c                    |    2 +-
 gtk/gtkaccessible.c                        |    8 +-
 gtk/gtksocket.c                            |    5 +-
 gtk/gtktextdisplay.c                       |   49 +-
 modules/other/gail/libgail-util/gailmisc.c |   10 +-
 po-properties/en_GB.po                     | 2012 ++++++++++++++--------------
 po-properties/es.po                        |  968 +++++++-------
 po/en_GB.po                                | 1025 ++++++++------
 po/hu.po                                   | 1370 +++++++++++--------
 po/pa.po                                   |  547 +++++---
 13 files changed, 3335 insertions(+), 2707 deletions(-)
---