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

[John Ralls <jralls src gnome org>]

commit 43792f58678fca3426ee0c59189882a59fc9407b
Merge: 5aaf5ce d4b9925
Author: John Ralls <jralls ceridwen us>
Date:   Tue Aug 2 23:21:28 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkcursor-x11.c                      |   12 +-
 gdk/x11/gdkdisplay-x11.c                     |   24 +-
 gdk/x11/gdkmain-x11.c                        |   10 +-
 gdk/x11/gdkproperty-x11.c                    |   16 +-
 gdk/x11/gdkscreen-x11.c                      |   12 +-
 gdk/x11/gdkselection-x11.c                   |    6 +-
 gdk/x11/gdkvisual-x11.c                      |    6 +-
 gdk/x11/gdkwindow-x11.c                      |   17 +-
 gdk/x11/gdkxid.c                             |    3 +-
 gtk/Makefile.am                              |    9 +-
 gtk/org.gtk.Settings.FileChooser.gschema.xml |    3 +
 po-properties/sv.po                          | 3620 +++++++++++++-------------
 po/sv.po                                     | 1542 +++++-------
 13 files changed, 2612 insertions(+), 2668 deletions(-)
---