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

[John Ralls <jralls src gnome org>]

commit 8548453fcecd8e07aa5a5ddb26b00555045045ae
Merge: e945021 5a86445
Author: John Ralls <jralls ceridwen us>
Date:   Fri Feb 11 23:21:21 2011 -0800

    Merge branch 'master' into quartz-integration

 build/win32/vs9/gdk-win32.vcproj |    2 +-
 build/win32/vs9/gtk+.vsprops     |    1 -
 docs/reference/gdk/gdk-docs.sgml |    8 +-
 docs/reference/gtk/gtk-docs.sgml |    8 +-
 gdk/gdkconfig.h.win32            |   33 +-
 gdk/x11/Makefile.am              |   30 +-
 gdk/x11/gdkdevice-xi.c           |   25 +-
 gdk/x11/gdkdevice-xi2.c          |   24 +-
 gdk/x11/gdkdevicemanager-xi.c    |   34 ++-
 gdk/x11/gdkdevicemanager-xi2.c   |   43 ++-
 gdk/x11/gdkprivate-x11.h         |    8 +
 gtk/gtkdnd.c                     |   51 +-
 gtk/gtkicontheme.c               |   16 +-
 gtk/gtkicontheme.h               |    8 +-
 gtk/gtkstylecontext.c            |    3 +-
 gtk/gtkstylecontext.h            |    3 +-
 po/ug.po                         | 1015 ++++++++++++++++++++++----------------
 tests/teststatusicon.c           |    4 +-
 18 files changed, 765 insertions(+), 551 deletions(-)
---