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

[John Ralls <jralls src gnome org>]

commit 5d838c5229f78156c25d7ad148f6692d8adac433
Merge: d088700 f3a66d0
Author: John Ralls <jralls ceridwen us>
Date:   Sun May 8 23:21:19 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/wayland/gdkdisplay-wayland.c        |   32 +--
 gdk/wayland/gdkdisplay-wayland.h        |    1 -
 gdk/wayland/gdkwindow-wayland.c         |    7 +-
 gtk/gtkarrow.c                          |    8 +-
 po-properties/es.po                     |  489 ++++++++++++++++++-------------
 tests/reftests/Makefile.am              |    6 +-
 tests/reftests/misc-alignment.ref.ui    |    2 +
 tests/reftests/misc-alignment.ui        |   16 +-
 tests/reftests/toplevel-vs-popup.ref.ui |   15 +
 tests/reftests/toplevel-vs-popup.ui     |   15 +
 10 files changed, 350 insertions(+), 241 deletions(-)
---